From 414b717088e089ac73e1928868790ef47253c0ee Mon Sep 17 00:00:00 2001
From: Lukas Aldershaab <lpjoergensen@gmail.com>
Date: Sat, 8 Apr 2023 09:33:23 +0200
Subject: [PATCH 1/2] Fix test reporting to work with multiple OS

---
 .github/workflows/cmake.yml        |  4 ++--
 .github/workflows/test-results.yml | 23 ++++++++++++++++++++---
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 275fe7a15..d198bbbd5 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -70,6 +70,6 @@ jobs:
         uses: actions/upload-artifact@v3
         if: always() # always run even if the previous step fails
         with:
-          name: junit-test-results
-          path: '${{github.workspace}}/My Projects/Torque3D/game/test_detail.xml'
+          name: junit-test-results-${{ runner.os }}
+          path: '**/My Projects/Torque3D/game/test_detail.xml'
           retention-days: 1
diff --git a/.github/workflows/test-results.yml b/.github/workflows/test-results.yml
index 106cb8de1..78a4fb480 100644
--- a/.github/workflows/test-results.yml
+++ b/.github/workflows/test-results.yml
@@ -11,14 +11,31 @@ jobs:
   checks:
     runs-on: ubuntu-latest
     steps:
-      - name: Download Test Report
+      # See https://docs.github.com/en/actions/learn-github-actions/variables#default-environment-variables
+      # for a list of possible values
+      - name: Download Windows Test Report
         uses: dawidd6/action-download-artifact@v2
         with:
-          name: junit-test-results
+          name: junit-test-results-Windows
           workflow: ${{ github.event.workflow.id }}
           run_id: ${{ github.event.workflow_run.id }}
+
+      - name: Download Linux Test Report
+        uses: dawidd6/action-download-artifact@v2
+        with:
+          name: junit-test-results-Linux
+          workflow: ${{ github.event.workflow.id }}
+          run_id: ${{ github.event.workflow_run.id }}
+
+      - name: Download Mac Test Report
+        uses: dawidd6/action-download-artifact@v2
+        with:
+          name: junit-test-results-macOS
+          workflow: ${{ github.event.workflow.id }}
+          run_id: ${{ github.event.workflow_run.id }}
+
       - name: Publish Test Report
         uses: mikepenz/action-junit-report@v3
         with:
           commit: ${{github.event.workflow_run.head_sha}}
-          report_paths: '${{github.workspace}}/My Projects/Torque3D/game/test_detail.xml'
+          report_paths: '**/My Projects/Torque3D/game/test_detail.xml'

From cabe07e0d60ac3ed29a1a43d7791afa8fdc68d0e Mon Sep 17 00:00:00 2001
From: Lukas Aldershaab <lpjoergensen@gmail.com>
Date: Sat, 8 Apr 2023 09:35:06 +0200
Subject: [PATCH 2/2] Download reports from different OS into the different
 folders

---
 .github/workflows/test-results.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/test-results.yml b/.github/workflows/test-results.yml
index 78a4fb480..32ea26ec6 100644
--- a/.github/workflows/test-results.yml
+++ b/.github/workflows/test-results.yml
@@ -16,6 +16,7 @@ jobs:
       - name: Download Windows Test Report
         uses: dawidd6/action-download-artifact@v2
         with:
+          path: Windows
           name: junit-test-results-Windows
           workflow: ${{ github.event.workflow.id }}
           run_id: ${{ github.event.workflow_run.id }}
@@ -23,6 +24,7 @@ jobs:
       - name: Download Linux Test Report
         uses: dawidd6/action-download-artifact@v2
         with:
+          path: Linux
           name: junit-test-results-Linux
           workflow: ${{ github.event.workflow.id }}
           run_id: ${{ github.event.workflow_run.id }}
@@ -30,6 +32,7 @@ jobs:
       - name: Download Mac Test Report
         uses: dawidd6/action-download-artifact@v2
         with:
+          path: macOS
           name: junit-test-results-macOS
           workflow: ${{ github.event.workflow.id }}
           run_id: ${{ github.event.workflow_run.id }}