diff --git a/.github/actions/test-results/action.yml b/.github/actions/test-results/action.yml deleted file mode 100644 index 5f94f3617..000000000 --- a/.github/actions/test-results/action.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: Build Torque Test Report -description: Upload Torques unit test artifact. -inputs: - name: - description: The name of the unit test. - default: "${{github.job}}" - artifact-name: - description: The name of the artifact. - required: true - path: - description: The path to the upload. - required: true - default: "**/My Projects/Torque3D/game/test_detail.xml" -runs: - using: "composite" - steps: - - name: Test Reporter - uses: phoenix-actions/test-reporting@v12 - with: - artifact: ${{inputs.artifact-name}} - name: ${{inputs.name}} - path: ${{inputs.path}} - reporter: java-junit \ No newline at end of file diff --git a/.github/actions/upload-artifact/action.yml b/.github/actions/upload-artifact/action.yml index 624096c7c..f876c5b8e 100644 --- a/.github/actions/upload-artifact/action.yml +++ b/.github/actions/upload-artifact/action.yml @@ -7,13 +7,14 @@ inputs: path: description: The path to the upload. required: true - default: "**/My Projects/Torque3D/game/test_detail.xml" + default: "Torque3D/My Projects/Torque3D/game/test_detail.xml" runs: using: "composite" steps: - name: Upload Torque Test Report - uses: actions/upload-artifact@v3.1.2 + 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 7d0a18dba..92d52dd63 100644 --- a/.github/workflows/build-linux-gcc.yml +++ b/.github/workflows/build-linux-gcc.yml @@ -65,7 +65,7 @@ jobs: - name: Configure, Build & Install - uses: threeal/cmake-action@v1.2.0 + uses: threeal/cmake-action@v1.3.0 with: source-dir: ${{github.workspace}} build-dir: ${{github.workspace}}/build @@ -85,3 +85,4 @@ jobs: uses: ./.github/actions/upload-artifact with: name: torque3dLinuxGCCUnitTest + path: "${{github.workspace}}/My Projects/Torque3D/game/test_detail.xml" diff --git a/.github/workflows/build-macos-clang.yml b/.github/workflows/build-macos-clang.yml index 3d3e34c1b..46e00132d 100644 --- a/.github/workflows/build-macos-clang.yml +++ b/.github/workflows/build-macos-clang.yml @@ -16,7 +16,7 @@ jobs: build-linux: if: github.repository == 'TorqueGameEngines/Torque3D' name: ${{matrix.config.name}} - runs-on: macos-latest + runs-on: macos-13 strategy: fail-fast: false matrix: @@ -46,7 +46,7 @@ jobs: cmake --version - name: Configure, Build & Install - uses: threeal/cmake-action@v1.2.0 + uses: threeal/cmake-action@v1.3.0 with: source-dir: ${{github.workspace}} build-dir: ${{github.workspace}}/build @@ -66,3 +66,4 @@ jobs: uses: ./.github/actions/upload-artifact with: name: torque3dMacOSXCLANGUnitTest + path: "${{github.workspace}}/My Projects/Torque3D/game/test_detail.xml" diff --git a/.github/workflows/build-windows-msvc.yml b/.github/workflows/build-windows-msvc.yml index ee642d711..6607bf86f 100644 --- a/.github/workflows/build-windows-msvc.yml +++ b/.github/workflows/build-windows-msvc.yml @@ -42,7 +42,7 @@ jobs: cmd "${{matrix.config.environment_script}}" - name: Configure, Build & Install - uses: threeal/cmake-action@v1.2.0 + uses: threeal/cmake-action@v1.3.0 with: source-dir: ${{github.workspace}} build-dir: ${{github.workspace}}/build @@ -62,3 +62,4 @@ jobs: uses: ./.github/actions/upload-artifact with: name: torque3dWindowsMSVCUnitTest + path: "${{github.workspace}}/My Projects/Torque3D/game/test_detail.xml" diff --git a/.github/workflows/test-results-linux.yml b/.github/workflows/test-results-linux.yml index 23a6b7a23..40eaeb298 100644 --- a/.github/workflows/test-results-linux.yml +++ b/.github/workflows/test-results-linux.yml @@ -24,7 +24,7 @@ jobs: steps: - name: Download Linux Test Report - uses: dawidd6/action-download-artifact@v2 + uses: dawidd6/action-download-artifact@v3 with: path: Linux name: ${{matrix.config.artifact-name}} @@ -32,10 +32,8 @@ jobs: run_id: ${{ github.event.workflow_run.id }} - name: Test Reporter - uses: phoenix-actions/test-reporting@v12 + uses: phoenix-actions/test-reporting@v14 with: - artifact: ${{matrix.config.artifact-name}} name: ${{matrix.config.name}} - path: "**/My Projects/Torque3D/game/test_detail.xml" + path: Linux/*.xml reporter: java-junit - output-to: 'checks' diff --git a/.github/workflows/test-results-mac.yml b/.github/workflows/test-results-mac.yml index 867582e53..a3b7c52a4 100644 --- a/.github/workflows/test-results-mac.yml +++ b/.github/workflows/test-results-mac.yml @@ -18,13 +18,13 @@ jobs: config: - { name: "Mac Test Results", - runos: macos-latest, + runos: macos-13, artifact-name: "torque3dMacOSXCLANGUnitTest" } steps: - name: Download Mac Test Report - uses: dawidd6/action-download-artifact@v2 + uses: dawidd6/action-download-artifact@v3 with: path: macOS name: ${{matrix.config.artifact-name}} @@ -32,10 +32,8 @@ jobs: run_id: ${{ github.event.workflow_run.id }} - name: Test Reporter - uses: phoenix-actions/test-reporting@v12 + uses: phoenix-actions/test-reporting@v14 with: - artifact: ${{matrix.config.artifact-name}} name: ${{matrix.config.name}} - path: "**/My Projects/Torque3D/game/test_detail.xml" + path: macOS/*.xml reporter: java-junit - output-to: 'checks' diff --git a/.github/workflows/test-results-windows.yml b/.github/workflows/test-results-windows.yml index 3bd32a0c9..b50926fe1 100644 --- a/.github/workflows/test-results-windows.yml +++ b/.github/workflows/test-results-windows.yml @@ -24,7 +24,7 @@ jobs: steps: - name: Download Windows Test Report - uses: dawidd6/action-download-artifact@v2 + uses: dawidd6/action-download-artifact@v3 with: path: Windows name: ${{matrix.config.artifact-name}} @@ -32,10 +32,8 @@ jobs: run_id: ${{ github.event.workflow_run.id }} - name: Test Reporter - uses: phoenix-actions/test-reporting@v12 + uses: phoenix-actions/test-reporting@v14 with: - artifact: ${{matrix.config.artifact-name}} name: ${{matrix.config.name}} - path: "**/My Projects/Torque3D/game/test_detail.xml" + path: Windows/*.xml reporter: java-junit - output-to: 'checks'