From afaf228d05f5798b8b0b93adc90aca887003170e Mon Sep 17 00:00:00 2001 From: marauder2k7 Date: Tue, 14 May 2024 02:25:28 +0100 Subject: [PATCH 1/4] remove upload -Removed: Upload artifact -Simplified the test reporter steps GIT CI seems to have major issues with the upload/download steps at the moment, so remove these and just report the test results --- .github/actions/upload-artifact/action.yml | 20 ----------- .github/workflows/build-linux-gcc.yml | 9 ++--- .github/workflows/build-macos-clang.yml | 9 ++--- .github/workflows/build-windows-msvc.yml | 9 ++--- .github/workflows/test-results-linux.yml | 39 ---------------------- .github/workflows/test-results-mac.yml | 39 ---------------------- .github/workflows/test-results-windows.yml | 39 ---------------------- 7 files changed, 15 insertions(+), 149 deletions(-) delete mode 100644 .github/actions/upload-artifact/action.yml delete mode 100644 .github/workflows/test-results-linux.yml delete mode 100644 .github/workflows/test-results-mac.yml delete mode 100644 .github/workflows/test-results-windows.yml diff --git a/.github/actions/upload-artifact/action.yml b/.github/actions/upload-artifact/action.yml deleted file mode 100644 index f876c5b8e..000000000 --- a/.github/actions/upload-artifact/action.yml +++ /dev/null @@ -1,20 +0,0 @@ -name: Upload Torque Test Report -description: Upload Torques unit test artifact. -inputs: - name: - description: The name of the unit test. - default: "${{github.job}}" - path: - description: The path to the upload. - required: true - default: "Torque3D/My Projects/Torque3D/game/test_detail.xml" -runs: - using: "composite" - steps: - - name: Upload Torque Test Report - uses: actions/upload-artifact@v4 - with: - name: ${{inputs.name}} - path: ${{inputs.path}} - retention-days: 1 - overwrite: true diff --git a/.github/workflows/build-linux-gcc.yml b/.github/workflows/build-linux-gcc.yml index 511cd401f..f4afbfe99 100644 --- a/.github/workflows/build-linux-gcc.yml +++ b/.github/workflows/build-linux-gcc.yml @@ -84,8 +84,9 @@ jobs: cd "${{github.workspace}}/My Projects/Torque3D/game" ./Torque3D runTests.tscript - - name: Upload Artifact - uses: ./.github/actions/upload-artifact + - name: Test Reporter + uses: phoenix-actions/test-reporting@v14 with: - name: torque3dLinuxGCCUnitTest - path: "${{github.workspace}}/My Projects/Torque3D/game/test_detail.xml" + name: ${{matrix.config.name}} + path: "**/My Projects/Torque3D/game/test_detail.xml" + reporter: java-junit diff --git a/.github/workflows/build-macos-clang.yml b/.github/workflows/build-macos-clang.yml index bf8a6318c..0d356d51a 100644 --- a/.github/workflows/build-macos-clang.yml +++ b/.github/workflows/build-macos-clang.yml @@ -65,8 +65,9 @@ jobs: cd "${{github.workspace}}/My Projects/Torque3D/game" ./Torque3D.app/Contents/MacOS/Torque3D runTests.tscript - - name: Upload Artifact - uses: ./.github/actions/upload-artifact + - name: Test Reporter + uses: phoenix-actions/test-reporting@v14 with: - name: torque3dMacOSXCLANGUnitTest - path: "${{github.workspace}}/My Projects/Torque3D/game/test_detail.xml" + name: ${{matrix.config.name}} + path: "**/My Projects/Torque3D/game/test_detail.xml" + reporter: java-junit diff --git a/.github/workflows/build-windows-msvc.yml b/.github/workflows/build-windows-msvc.yml index 603a41e17..5d3f7b09c 100644 --- a/.github/workflows/build-windows-msvc.yml +++ b/.github/workflows/build-windows-msvc.yml @@ -61,8 +61,9 @@ jobs: cd "${{github.workspace}}/My Projects/Torque3D/game" ./Torque3D.exe runTests.tscript - - name: Upload Artifact - uses: ./.github/actions/upload-artifact + - name: Test Reporter + uses: phoenix-actions/test-reporting@v14 with: - name: torque3dWindowsMSVCUnitTest - path: "${{github.workspace}}/My Projects/Torque3D/game/test_detail.xml" + name: ${{matrix.config.name}} + path: "**/My Projects/Torque3D/game/test_detail.xml" + reporter: java-junit diff --git a/.github/workflows/test-results-linux.yml b/.github/workflows/test-results-linux.yml deleted file mode 100644 index 725bbd572..000000000 --- a/.github/workflows/test-results-linux.yml +++ /dev/null @@ -1,39 +0,0 @@ -name: Linux Test Results -on: - workflow_run: - workflows: ["Linux Build"] - types: - - completed - -permissions: - checks: write - -jobs: - checks: - name: ${{matrix.config.name}} - runs-on: ${{matrix.config.runos}} - strategy: - fail-fast: false - matrix: - config: - - { - name: "Linux Test Results", - runos: ubuntu-latest, - artifact-name: "torque3dLinuxGCCUnitTest" - } - - steps: - - name: Download Linux Test Report - uses: dawidd6/action-download-artifact@v3 - with: - path: Linux - name: ${{matrix.config.artifact-name}} - workflow: ${{ github.event.workflow.id }} - run_id: ${{ github.event.workflow_run.id }} - - - name: Test Reporter - uses: phoenix-actions/test-reporting@v14 - with: - name: ${{matrix.config.name}} - path: "**/My Projects/Torque3D/game/test_detail.xml" - reporter: java-junit diff --git a/.github/workflows/test-results-mac.yml b/.github/workflows/test-results-mac.yml deleted file mode 100644 index f1337b00a..000000000 --- a/.github/workflows/test-results-mac.yml +++ /dev/null @@ -1,39 +0,0 @@ -name: Mac Test Results -on: - workflow_run: - workflows: ["MacOSX Build"] - types: - - completed - -permissions: - checks: write - -jobs: - checks: - name: ${{matrix.config.name}} - runs-on: ${{matrix.config.runos}} - strategy: - fail-fast: false - matrix: - config: - - { - name: "Mac Test Results", - runos: macos-13, - artifact-name: "torque3dMacOSXCLANGUnitTest" - } - - steps: - - name: Download Mac Test Report - uses: dawidd6/action-download-artifact@v3 - with: - path: macOS - name: ${{matrix.config.artifact-name}} - workflow: ${{ github.event.workflow.id }} - run_id: ${{ github.event.workflow_run.id }} - - - name: Test Reporter - uses: phoenix-actions/test-reporting@v14 - with: - name: ${{matrix.config.name}} - path: "**/My Projects/Torque3D/game/test_detail.xml" - reporter: java-junit diff --git a/.github/workflows/test-results-windows.yml b/.github/workflows/test-results-windows.yml deleted file mode 100644 index 6a8964d4d..000000000 --- a/.github/workflows/test-results-windows.yml +++ /dev/null @@ -1,39 +0,0 @@ -name: Windows Test Results -on: - workflow_run: - workflows: ["Windows Build"] - types: - - completed - -permissions: - checks: write - -jobs: - checks: - name: ${{matrix.config.name}} - runs-on: ${{matrix.config.runos}} - strategy: - fail-fast: false - matrix: - config: - - { - name: "Windows Test Results", - runos: windows-latest, - artifact-name: "torque3dWindowsMSVCUnitTest" - } - - steps: - - name: Download Windows Test Report - uses: dawidd6/action-download-artifact@v3 - with: - path: Windows - name: ${{matrix.config.artifact-name}} - workflow: ${{ github.event.workflow.id }} - run_id: ${{ github.event.workflow_run.id }} - - - name: Test Reporter - uses: phoenix-actions/test-reporting@v14 - with: - name: ${{matrix.config.name}} - path: "**/My Projects/Torque3D/game/test_detail.xml" - reporter: java-junit From cbf7b3a479d3bdcaaf547e02c356373fc87336b7 Mon Sep 17 00:00:00 2001 From: marauder2k7 Date: Tue, 14 May 2024 02:48:28 +0100 Subject: [PATCH 2/4] replace path path fix --- .github/workflows/build-linux-gcc.yml | 4 ++-- .github/workflows/build-macos-clang.yml | 4 ++-- .github/workflows/build-windows-msvc.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-linux-gcc.yml b/.github/workflows/build-linux-gcc.yml index f4afbfe99..8214d1a5c 100644 --- a/.github/workflows/build-linux-gcc.yml +++ b/.github/workflows/build-linux-gcc.yml @@ -87,6 +87,6 @@ jobs: - name: Test Reporter uses: phoenix-actions/test-reporting@v14 with: - name: ${{matrix.config.name}} - path: "**/My Projects/Torque3D/game/test_detail.xml" + name: Linux test results + path: "${{github.workspace}}/My Projects/Torque3D/game/test_detail.xml" reporter: java-junit diff --git a/.github/workflows/build-macos-clang.yml b/.github/workflows/build-macos-clang.yml index 0d356d51a..3d99ab883 100644 --- a/.github/workflows/build-macos-clang.yml +++ b/.github/workflows/build-macos-clang.yml @@ -68,6 +68,6 @@ jobs: - name: Test Reporter uses: phoenix-actions/test-reporting@v14 with: - name: ${{matrix.config.name}} - path: "**/My Projects/Torque3D/game/test_detail.xml" + name: MacOS Test results + path: "${{github.workspace}}/My Projects/Torque3D/game/test_detail.xml" reporter: java-junit diff --git a/.github/workflows/build-windows-msvc.yml b/.github/workflows/build-windows-msvc.yml index 5d3f7b09c..fc53024bb 100644 --- a/.github/workflows/build-windows-msvc.yml +++ b/.github/workflows/build-windows-msvc.yml @@ -64,6 +64,6 @@ jobs: - name: Test Reporter uses: phoenix-actions/test-reporting@v14 with: - name: ${{matrix.config.name}} - path: "**/My Projects/Torque3D/game/test_detail.xml" + name: Windows test results + path: "${{github.workspace}}/My Projects/Torque3D/game/test_detail.xml" reporter: java-junit From 8e89765a79b5970b0418949cd7a5a3aa38e1ce35 Mon Sep 17 00:00:00 2001 From: marauder2k7 Date: Tue, 14 May 2024 03:12:46 +0100 Subject: [PATCH 3/4] ugh add permissions required for test reporter no longer fail on error of creating a test report --- .github/workflows/build-linux-gcc.yml | 11 ++++++++++- .github/workflows/build-macos-clang.yml | 11 ++++++++++- .github/workflows/build-windows-msvc.yml | 11 ++++++++++- 3 files changed, 30 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-linux-gcc.yml b/.github/workflows/build-linux-gcc.yml index 8214d1a5c..4bf7bcb2a 100644 --- a/.github/workflows/build-linux-gcc.yml +++ b/.github/workflows/build-linux-gcc.yml @@ -12,6 +12,14 @@ env: concurrency: group: ci-${{github.actor}}-${{github.head_ref || github.run_number}}-${{github.ref}}-linux cancel-in-progress: true + +permissions: + statuses: write + checks: write + contents: write + pull-requests: write + actions: write + jobs: build-linux: if: github.repository == 'TorqueGameEngines/Torque3D' @@ -88,5 +96,6 @@ jobs: uses: phoenix-actions/test-reporting@v14 with: name: Linux test results - path: "${{github.workspace}}/My Projects/Torque3D/game/test_detail.xml" + path: "**/My Projects/Torque3D/game/test_detail.xml" reporter: java-junit + fail-on-error: false diff --git a/.github/workflows/build-macos-clang.yml b/.github/workflows/build-macos-clang.yml index 3d99ab883..6ce380a3b 100644 --- a/.github/workflows/build-macos-clang.yml +++ b/.github/workflows/build-macos-clang.yml @@ -12,6 +12,14 @@ env: concurrency: group: ci-${{github.actor}}-${{github.head_ref || github.run_number}}-${{github.ref}}-macosx cancel-in-progress: true + +permissions: + statuses: write + checks: write + contents: write + pull-requests: write + actions: write + jobs: build-linux: if: github.repository == 'TorqueGameEngines/Torque3D' @@ -69,5 +77,6 @@ jobs: uses: phoenix-actions/test-reporting@v14 with: name: MacOS Test results - path: "${{github.workspace}}/My Projects/Torque3D/game/test_detail.xml" + path: "**/My Projects/Torque3D/game/test_detail.xml" reporter: java-junit + fail-on-error: false diff --git a/.github/workflows/build-windows-msvc.yml b/.github/workflows/build-windows-msvc.yml index fc53024bb..6b6e438ce 100644 --- a/.github/workflows/build-windows-msvc.yml +++ b/.github/workflows/build-windows-msvc.yml @@ -7,6 +7,14 @@ on: concurrency: group: ci-${{github.actor}}-${{github.head_ref || github.run_number}}-${{github.ref}}-windows cancel-in-progress: true + +permissions: + statuses: write + checks: write + contents: write + pull-requests: write + actions: write + jobs: build-windows: if: github.repository == 'TorqueGameEngines/Torque3D' @@ -65,5 +73,6 @@ jobs: uses: phoenix-actions/test-reporting@v14 with: name: Windows test results - path: "${{github.workspace}}/My Projects/Torque3D/game/test_detail.xml" + path: "**/My Projects/Torque3D/game/test_detail.xml" reporter: java-junit + fail-on-error: false From 0400bec34f069c830ca8e40c3ec982de59ab5c0f Mon Sep 17 00:00:00 2001 From: marauder2k7 Date: Tue, 14 May 2024 03:43:09 +0100 Subject: [PATCH 4/4] required permissions only --- .github/workflows/build-linux-gcc.yml | 4 ---- .github/workflows/build-macos-clang.yml | 4 ---- .github/workflows/build-windows-msvc.yml | 4 ---- 3 files changed, 12 deletions(-) diff --git a/.github/workflows/build-linux-gcc.yml b/.github/workflows/build-linux-gcc.yml index 4bf7bcb2a..7734a60d7 100644 --- a/.github/workflows/build-linux-gcc.yml +++ b/.github/workflows/build-linux-gcc.yml @@ -14,11 +14,7 @@ concurrency: cancel-in-progress: true permissions: - statuses: write checks: write - contents: write - pull-requests: write - actions: write jobs: build-linux: diff --git a/.github/workflows/build-macos-clang.yml b/.github/workflows/build-macos-clang.yml index 6ce380a3b..a27f04287 100644 --- a/.github/workflows/build-macos-clang.yml +++ b/.github/workflows/build-macos-clang.yml @@ -14,11 +14,7 @@ concurrency: cancel-in-progress: true permissions: - statuses: write checks: write - contents: write - pull-requests: write - actions: write jobs: build-linux: diff --git a/.github/workflows/build-windows-msvc.yml b/.github/workflows/build-windows-msvc.yml index 6b6e438ce..0fbcd0ecd 100644 --- a/.github/workflows/build-windows-msvc.yml +++ b/.github/workflows/build-windows-msvc.yml @@ -9,11 +9,7 @@ concurrency: cancel-in-progress: true permissions: - statuses: write checks: write - contents: write - pull-requests: write - actions: write jobs: build-windows: