Update upload artifact action in support of #3064

Unidata · Dec 16, 2024 · 2a23468 · 2a23468
1 parent fb75ad6
commit 2a23468
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 12 deletions.
diff --git a/.github/workflows/run_tests_ubuntu.yml b/.github/workflows/run_tests_ubuntu.yml
@@ -17,11 +17,14 @@ jobs:
 
   build-deps-serial:
 
-    runs-on: ubuntu-latest
+    # runs-on: ubuntu-latest
 
     strategy:
       matrix:
         hdf5: [ 1.10.8, 1.12.2, 1.14.3 ]
+        runs-on: [ ubuntu-latest ]
+
+    runs-on: ${{ matrix.runs-on }}
 
     steps:
       - uses: actions/checkout@v4
@@ -127,11 +130,14 @@ jobs:
   nc-ac-tests-oneoff-serial-shared:
 
     needs: build-deps-serial
-    runs-on: ubuntu-latest
+
 
     strategy:
       matrix:
         hdf5: [ 1.14.3 ]
+        runs-on: [ ubuntu-latest ]
+
+    runs-on: ${{ matrix.runs-on }}
     steps:
 
       - uses: actions/checkout@v4
@@ -208,9 +214,9 @@ jobs:
         if: ${{ success() }}
         run: make dist -j
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
-          name: netcdf-c-autotools-source-distribution
+          name: netcdf-c-autotools-source-distribution-${{ matrix.runs-on }}
           path: |
             *.tar*
             *.zip
@@ -222,11 +228,14 @@ jobs:
   nc-ac-tests-oneoff-serial-static:
 
     needs: build-deps-serial
-    runs-on: ubuntu-latest
+
 
     strategy:
       matrix:
         hdf5: [ 1.14.3 ]
+        runs-on: [ ubuntu-latest ]
+
+    runs-on: ${{ matrix.runs-on }}
     steps:
 
       - uses: actions/checkout@v4
@@ -303,9 +312,9 @@ jobs:
         if: ${{ success() }}
         run: make dist -j
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
-          name: netcdf-c-autotools-source-distribution
+          name: netcdf-c-autotools-source-distribution-${{ matrix.runs-on }}
           path: |
             *.tar*
             *.zip
@@ -637,19 +646,22 @@ jobs:
   nc-autotools:
 
     needs: [ nc-cmake-tests-oneoff-serial-shared, nc-cmake-tests-oneoff-serial-static, nc-ac-tests-oneoff-serial-shared, nc-ac-tests-oneoff-serial-static, nc-cmake-tests-oneoff-parallel, nc-ac-tests-oneoff-parallel ]
-    runs-on: ubuntu-latest
+
 
     strategy:
       matrix:
         hdf5: [1.10.8, 1.12.2, 1.14.3 ]
         use_nc4: [ nc3, nc4 ]
         use_dap: [ dap_off, dap_on ]
         use_nczarr: [ nczarr_off, nczarr_on ]
+        runs-on: [ ubuntu-latest ]
+
+    runs-on: ${{ matrix.runs-on }}
     steps:
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
-          name: netcdf-c-autotools-source-distribution
+          name: netcdf-c-autotools-source-distribution-${{ matrix.runs-on }}
 
       - name: Unpack source distribution
         shell: bash -l {0}

diff --git a/.github/workflows/run_tests_win_mingw.yml b/.github/workflows/run_tests_win_mingw.yml
@@ -72,9 +72,9 @@ jobs:
 
       - name: Upload test failures
         if: ${{ failure() && steps.tests.conclusion == 'failure' }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: mingw-autotools-test-logs
+          name: mingw-autotools-test-logs-${{ matrix.msystem }}
           path: |
             */*.log
             */*.trs