From 2a23468339be0a6ece056357ff7d9c7805fc13a4 Mon Sep 17 00:00:00 2001
From: Ward Fisher <wfisher@ucar.edu>
Date: Mon, 16 Dec 2024 16:41:30 -0700
Subject: [PATCH] Update upload artifact action in support of
 https://github.com/Unidata/netcdf-c/issues/3064

---
 .github/workflows/run_tests_ubuntu.yml    | 32 ++++++++++++++++-------
 .github/workflows/run_tests_win_mingw.yml |  4 +--
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/run_tests_ubuntu.yml b/.github/workflows/run_tests_ubuntu.yml
index 3ec6a595cd..bed2e088aa 100644
--- 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,7 +646,7 @@ 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:
@@ -645,11 +654,14 @@ jobs:
         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
index 032a31a894..410dd3d331 100644
--- 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