From 1a62e0a8e20b979aa7404ef4bc5f478552006a8a Mon Sep 17 00:00:00 2001
From: Brad Keryan <brad.keryan@ni.com>
Date: Thu, 27 Jun 2024 17:54:11 -0500
Subject: [PATCH] GitHub: Upgrade to upload/download-artifact v4

---
 .github/workflows/report_test_results.yml | 5 +++--
 .github/workflows/run_system_tests.yml    | 4 ++--
 .github/workflows/run_unit_tests.yml      | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/report_test_results.yml b/.github/workflows/report_test_results.yml
index bdf88e7fb..9ea61bda3 100644
--- a/.github/workflows/report_test_results.yml
+++ b/.github/workflows/report_test_results.yml
@@ -16,10 +16,11 @@ jobs:
       - name: Check out repo
         uses: actions/checkout@v3
       - name: Download test results
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
-          name: test_results
           path: test_results
+          pattern: test_results_*
+          merge-multiple: true
       - name: List downloaded files
         run: ls -lR
       - name: Publish test results
diff --git a/.github/workflows/run_system_tests.yml b/.github/workflows/run_system_tests.yml
index f124b32e0..625c3f167 100644
--- a/.github/workflows/run_system_tests.yml
+++ b/.github/workflows/run_system_tests.yml
@@ -38,8 +38,8 @@ jobs:
           done
         if: always() && runner.os != 'Windows'
       - name: Upload test results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: test_results
+          name: test_results_system_${{ matrix.configuration }}
           path: test_results/*.xml
         if: always()
diff --git a/.github/workflows/run_unit_tests.yml b/.github/workflows/run_unit_tests.yml
index d1e188d72..087f5f64b 100644
--- a/.github/workflows/run_unit_tests.yml
+++ b/.github/workflows/run_unit_tests.yml
@@ -39,8 +39,8 @@ jobs:
       - name: Run unit tests
         run: poetry run pytest -v --cov=generated/nidaqmx --junitxml=test_results/unit-${{ matrix.os }}-py${{ matrix.python-version }}.xml tests/unit
       - name: Upload test results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: test_results
+          name: test_results_unit_${{ matrix.os }}_py${{ matrix.python-version }}
           path: test_results/*.xml
         if: always()
\ No newline at end of file