switched ci to g2-3.4.9 (#315)

* switched ci to g2-3.4.9 * switched ci to g2-3.4.9 * switched ci to g2-3.4.9
NOAA-EMC · Mar 21, 2024 · 2acaac2 · 2acaac2
1 parent a0a1d7f
commit 2acaac2
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 29 deletions.
diff --git a/.github/workflows/Intel.yml b/.github/workflows/Intel.yml
@@ -169,15 +169,15 @@ jobs:
       uses: actions/cache@v3
       with:
         path: ~/g2
-        key: g2-Intel-${{ matrix.compilers }}-${{ runner.os }}-develop-2
+        key: g2-Intel-${{ matrix.compilers }}-${{ runner.os }}-3.4.9-2
 
     - name: checkout-g2
       if: steps.cache-g2.outputs.cache-hit != 'true'
       uses: actions/checkout@v3
       with:
         repository: NOAA-EMC/NCEPLIBS-g2
         path: g2
-        ref: develop
+        ref: v3.4.9
 
     - name: build-g2
       if: steps.cache-g2.outputs.cache-hit != 'true'

diff --git a/.github/workflows/Linux_external.yml b/.github/workflows/Linux_external.yml
@@ -23,7 +23,7 @@ jobs:
       fail-fast: true
       matrix:
         ip-version: [5.0.0]
-        g2-version: [3.4.8]
+        g2-version: [3.4.9]
         bacio-version: [2.6.0]
         jasper-version: [2.0.33, 3.0.5, 4.0.0]
         w3emc-version: [2.11.0]
@@ -148,23 +148,23 @@ jobs:
         make -j2
         make install
                  
-    # - name: cache-g2
-    #   id: cache-g2
-    #   uses: actions/cache@v3
-    #   with:
-    #     path: ~/g2
-    #     key: linux_external_g2-${{ runner.os }}-${{ matrix.g2-version }}-${{ matrix.jasper-version }}-${{ matrix.bacio-version }}-${{ matrix.w3emc-version }}-${{ matrix.ip-version }}-4
+    - name: cache-g2
+      id: cache-g2
+      uses: actions/cache@v3
+      with:
+        path: ~/g2
+        key: linux_external_g2-${{ runner.os }}-${{ matrix.g2-version }}-${{ matrix.jasper-version }}-${{ matrix.bacio-version }}-${{ matrix.w3emc-version }}-${{ matrix.ip-version }}-5
 
     - name: checkout-g2
-#      if: steps.cache-g2.outputs.cache-hit != 'true'
+      if: steps.cache-g2.outputs.cache-hit != 'true'
       uses: actions/checkout@v3
       with:
         repository: NOAA-EMC/NCEPLIBS-g2
         path: g2
-        ref: develop
+        ref: v${{ matrix.g2-version }}
 
     - name: build-g2
- #     if: steps.cache-g2.outputs.cache-hit != 'true'      
+      if: steps.cache-g2.outputs.cache-hit != 'true'      
       run: |
         cd g2
         mkdir build

diff --git a/.github/workflows/Linux_versions.yml b/.github/workflows/Linux_versions.yml
@@ -22,7 +22,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        g2-version: [3.4.8]
+        g2-version: [3.4.9]
         bacio-version: [2.4.1, 2.6.0]
         jasper-version: [4.0.0]
         w3emc-version: [2.10.0, 2.11.0]
@@ -184,23 +184,23 @@ jobs:
         make -j2
         make install
                  
-    # - name: cache-g2
-    #   id: cache-g2
-    #   uses: actions/cache@v3
-    #   with:
-    #     path: ~/g2
-    #     key: g2-${{ runner.os }}-${{ matrix.bacio-version }}-${{ matrix.jasper-version }}-${{ matrix.w3emc-version }}-${{ matrix.g2-version }}-2
+    - name: cache-g2
+      id: cache-g2
+      uses: actions/cache@v3
+      with:
+        path: ~/g2
+        key: g2-${{ runner.os }}-${{ matrix.bacio-version }}-${{ matrix.jasper-version }}-${{ matrix.w3emc-version }}-${{ matrix.g2-version }}-3
 
     - name: checkout-g2
-#      if: steps.cache-g2.outputs.cache-hit != 'true'
+      if: steps.cache-g2.outputs.cache-hit != 'true'
       uses: actions/checkout@v3
       with:
         repository: NOAA-EMC/NCEPLIBS-g2
         path: g2
-        ref: develop
+        ref: v${{ matrix.g2-version }}
 
     - name: build-g2
-#      if: steps.cache-g2.outputs.cache-hit != 'true'
+      if: steps.cache-g2.outputs.cache-hit != 'true'
       run: |
         cd g2
         mkdir build

diff --git a/.github/workflows/MacOS.yml b/.github/workflows/MacOS.yml
@@ -122,20 +122,20 @@ jobs:
         make -j2
         make install
           
-    # - name: cache-g2
-    #   id: cache-g2
-    #   uses: actions/cache@v3
-    #   with:
-    #     path: ~/g2
-    #     key: g2-MacOS-${{ runner.os }}-4.0.0-2.6.0-develop
+    - name: cache-g2
+      id: cache-g2
+      uses: actions/cache@v3
+      with:
+        path: ~/g2
+        key: g2-MacOS-${{ runner.os }}-4.0.0-2.6.0-3.4.9
 
     - name: checkout-g2
       if: steps.cache-g2.outputs.cache-hit != 'true'
       uses: actions/checkout@v3
       with:
         repository: NOAA-EMC/NCEPLIBS-g2
         path: g2
-        ref: develop
+        ref: v3.4.9
 
     - name: build-g2
       if: steps.cache-g2.outputs.cache-hit != 'true'