From 8767ae6eee15deca8f998502d530fb947b421434 Mon Sep 17 00:00:00 2001
From: Theresa Kamerman <theresa.kamerman@jpl.nasa.gov>
Date: Tue, 20 Feb 2024 08:47:25 -0800
Subject: [PATCH] Resolve upload-artifact breaking changes

---
 .github/workflows/security-scan.yml |  2 +-
 .github/workflows/test.yml          | 33 +++++++++--------------------
 2 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/security-scan.yml b/.github/workflows/security-scan.yml
index fb6d4fd516..923e9c26c1 100644
--- a/.github/workflows/security-scan.yml
+++ b/.github/workflows/security-scan.yml
@@ -91,5 +91,5 @@ jobs:
       - name: Upload Security Scan Results
         uses: actions/upload-artifact@v4
         with:
-          name: Security Scan Results
+          name: Security Scan Results - ${{ matrix.language }}
           path: ${{ env.RESULTS_DIR }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 4553f87482..c123f46a11 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -39,18 +39,14 @@ jobs:
         run: ./gradlew assemble --parallel
       - name: Run Unit Tests
         run: ./gradlew test --parallel
-      - name: Upload Test Results as XML
+      - name: Upload Test Results as XML and HTML
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: Test Results
-          path: "**/build/test-results/test"
-      - name: Upload Test Results as HTML
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: Test Results
-          path: "**/build/reports/tests/test"
+          name: Unit Test Results
+          path: |
+            **/build/test-results/test
+            **/build/reports/tests/test
 
   e2e-test:
     runs-on: ubuntu-latest
@@ -87,20 +83,11 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: Test Results
-          path: "**/e2e-tests/build/reports/tests/e2eTest"
-      - name: Upload DB Test Results as HTML
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: Test Results
-          path: "**/db-tests/build/reports/tests/e2eTest"
-      - name: Upload Sequencing Server Test Results
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: Test Results
-          path: "**/sequencing-server/test-report.*"
+          name: E2E Test Results
+          path: |
+            **/e2e-tests/build/reports/tests/e2eTest
+            **/db-tests/build/reports/tests/e2eTest
+            **/sequencing-server/test-report.*
       - name: Print Logs for Services
         if: always()
         run: docker compose -f ./e2e-tests/docker-compose-test.yml logs -t