瀏覽代碼

Merge pull request #1277 from marauder2k9-torque/simplify-ci

Remove extraneous steps that are causing issues
Brian Roberts 1 年之前
父節點
當前提交
615175a7a9

+ 0 - 20
.github/actions/upload-artifact/action.yml

@@ -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

+ 10 - 4
.github/workflows/build-linux-gcc.yml

@@ -12,6 +12,10 @@ env:
 concurrency:
 concurrency:
     group: ci-${{github.actor}}-${{github.head_ref || github.run_number}}-${{github.ref}}-linux
     group: ci-${{github.actor}}-${{github.head_ref || github.run_number}}-${{github.ref}}-linux
     cancel-in-progress: true
     cancel-in-progress: true
+
+permissions:
+  checks: write
+
 jobs:
 jobs:
     build-linux:
     build-linux:
         if: github.repository == 'TorqueGameEngines/Torque3D'
         if: github.repository == 'TorqueGameEngines/Torque3D'
@@ -84,8 +88,10 @@ jobs:
                 cd "${{github.workspace}}/My Projects/Torque3D/game"
                 cd "${{github.workspace}}/My Projects/Torque3D/game"
                 ./Torque3D runTests.tscript
                 ./Torque3D runTests.tscript
 
 
-            - name: Upload Artifact
-              uses: ./.github/actions/upload-artifact
+            - name: Test Reporter
+              uses: phoenix-actions/test-reporting@v14
               with:
               with:
-                name: torque3dLinuxGCCUnitTest
-                path: "${{github.workspace}}/My Projects/Torque3D/game/test_detail.xml"
+                name: Linux test results
+                path: "**/My Projects/Torque3D/game/test_detail.xml"
+                reporter: java-junit
+                fail-on-error: false

+ 10 - 4
.github/workflows/build-macos-clang.yml

@@ -12,6 +12,10 @@ env:
 concurrency:
 concurrency:
     group: ci-${{github.actor}}-${{github.head_ref || github.run_number}}-${{github.ref}}-macosx
     group: ci-${{github.actor}}-${{github.head_ref || github.run_number}}-${{github.ref}}-macosx
     cancel-in-progress: true
     cancel-in-progress: true
+
+permissions:
+  checks: write
+
 jobs:
 jobs:
     build-linux:
     build-linux:
         if: github.repository == 'TorqueGameEngines/Torque3D'
         if: github.repository == 'TorqueGameEngines/Torque3D'
@@ -65,8 +69,10 @@ jobs:
                 cd "${{github.workspace}}/My Projects/Torque3D/game"
                 cd "${{github.workspace}}/My Projects/Torque3D/game"
                 ./Torque3D.app/Contents/MacOS/Torque3D runTests.tscript
                 ./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:
               with:
-                name: torque3dMacOSXCLANGUnitTest
-                path: "${{github.workspace}}/My Projects/Torque3D/game/test_detail.xml"
+                name: MacOS Test results
+                path: "**/My Projects/Torque3D/game/test_detail.xml"
+                reporter: java-junit
+                fail-on-error: false

+ 10 - 4
.github/workflows/build-windows-msvc.yml

@@ -7,6 +7,10 @@ on:
 concurrency:
 concurrency:
     group: ci-${{github.actor}}-${{github.head_ref || github.run_number}}-${{github.ref}}-windows
     group: ci-${{github.actor}}-${{github.head_ref || github.run_number}}-${{github.ref}}-windows
     cancel-in-progress: true
     cancel-in-progress: true
+
+permissions:
+  checks: write
+
 jobs:
 jobs:
     build-windows:
     build-windows:
         if: github.repository == 'TorqueGameEngines/Torque3D'
         if: github.repository == 'TorqueGameEngines/Torque3D'
@@ -61,8 +65,10 @@ jobs:
                 cd "${{github.workspace}}/My Projects/Torque3D/game"
                 cd "${{github.workspace}}/My Projects/Torque3D/game"
                 ./Torque3D.exe runTests.tscript
                 ./Torque3D.exe runTests.tscript
 
 
-            - name: Upload Artifact
-              uses: ./.github/actions/upload-artifact
+            - name: Test Reporter
+              uses: phoenix-actions/test-reporting@v14
               with:
               with:
-                name: torque3dWindowsMSVCUnitTest
-                path: "${{github.workspace}}/My Projects/Torque3D/game/test_detail.xml"
+                name: Windows test results
+                path: "**/My Projects/Torque3D/game/test_detail.xml"
+                reporter: java-junit
+                fail-on-error: false

+ 0 - 39
.github/workflows/test-results-linux.yml

@@ -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

+ 0 - 39
.github/workflows/test-results-mac.yml

@@ -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

+ 0 - 39
.github/workflows/test-results-windows.yml

@@ -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