TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-14 16:14:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/development' into torquescript-errorPrinting

Browse source
This commit is contained in:
marauder2k7 2024-04-28 21:57:24 +01:00
commit 6e4a39db5d
8 changed files with 20 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

23
.github/actions/test-results/action.yml vendored
View file

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

5
.github/actions/upload-artifact/action.yml vendored
View file

@ -7,13 +7,14 @@ inputs:
path: path:
description: The path to the upload. description: The path to the upload.
required: true required: true
default: "**/My Projects/Torque3D/game/test_detail.xml" default: "Torque3D/My Projects/Torque3D/game/test_detail.xml"
runs: runs:
using: "composite" using: "composite"
steps: steps:
- name: Upload Torque Test Report - name: Upload Torque Test Report
uses: actions/upload-artifact@v3.1.2 uses: actions/upload-artifact@v4
with: with:
name: ${{inputs.name}} name: ${{inputs.name}}
path: ${{inputs.path}} path: ${{inputs.path}}
retention-days: 1 retention-days: 1
overwrite: true

3
.github/workflows/build-linux-gcc.yml vendored
View file

@ -65,7 +65,7 @@ jobs:
- name: Configure, Build & Install - name: Configure, Build & Install
uses: threeal/cmake-action@v1.2.0 uses: threeal/cmake-action@v1.3.0
with: with:
source-dir: ${{github.workspace}} source-dir: ${{github.workspace}}
build-dir: ${{github.workspace}}/build build-dir: ${{github.workspace}}/build
@ -85,3 +85,4 @@ jobs:
uses: ./.github/actions/upload-artifact uses: ./.github/actions/upload-artifact
with: with:
name: torque3dLinuxGCCUnitTest name: torque3dLinuxGCCUnitTest
path: "${{github.workspace}}/My Projects/Torque3D/game/test_detail.xml"

5
.github/workflows/build-macos-clang.yml vendored
View file

@ -16,7 +16,7 @@ jobs:
build-linux: build-linux:
if: github.repository == 'TorqueGameEngines/Torque3D' if: github.repository == 'TorqueGameEngines/Torque3D'
name: ${{matrix.config.name}} name: ${{matrix.config.name}}
runs-on: macos-latest runs-on: macos-13
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
@ -46,7 +46,7 @@ jobs:
cmake --version cmake --version
- name: Configure, Build & Install - name: Configure, Build & Install
uses: threeal/cmake-action@v1.2.0 uses: threeal/cmake-action@v1.3.0
with: with:
source-dir: ${{github.workspace}} source-dir: ${{github.workspace}}
build-dir: ${{github.workspace}}/build build-dir: ${{github.workspace}}/build
@ -66,3 +66,4 @@ jobs:
uses: ./.github/actions/upload-artifact uses: ./.github/actions/upload-artifact
with: with:
name: torque3dMacOSXCLANGUnitTest name: torque3dMacOSXCLANGUnitTest
path: "${{github.workspace}}/My Projects/Torque3D/game/test_detail.xml"

3
.github/workflows/build-windows-msvc.yml vendored
View file

@ -42,7 +42,7 @@ jobs:
cmd "${{matrix.config.environment_script}}" cmd "${{matrix.config.environment_script}}"
- name: Configure, Build & Install - name: Configure, Build & Install
uses: threeal/cmake-action@v1.2.0 uses: threeal/cmake-action@v1.3.0
with: with:
source-dir: ${{github.workspace}} source-dir: ${{github.workspace}}
build-dir: ${{github.workspace}}/build build-dir: ${{github.workspace}}/build
@ -62,3 +62,4 @@ jobs:
uses: ./.github/actions/upload-artifact uses: ./.github/actions/upload-artifact
with: with:
name: torque3dWindowsMSVCUnitTest name: torque3dWindowsMSVCUnitTest
path: "${{github.workspace}}/My Projects/Torque3D/game/test_detail.xml"

8
.github/workflows/test-results-linux.yml vendored
View file

@ -24,7 +24,7 @@ jobs:
steps: steps:
- name: Download Linux Test Report - name: Download Linux Test Report
uses: dawidd6/action-download-artifact@v2 uses: dawidd6/action-download-artifact@v3
with: with:
path: Linux path: Linux
name: ${{matrix.config.artifact-name}} name: ${{matrix.config.artifact-name}}
@ -32,10 +32,8 @@ jobs:
run_id: ${{ github.event.workflow_run.id }} run_id: ${{ github.event.workflow_run.id }}
- name: Test Reporter - name: Test Reporter
uses: phoenix-actions/test-reporting@v12 uses: phoenix-actions/test-reporting@v14
with: with:
artifact: ${{matrix.config.artifact-name}}
name: ${{matrix.config.name}} name: ${{matrix.config.name}}
path: "**/My Projects/Torque3D/game/test_detail.xml" path: Linux/*.xml
reporter: java-junit reporter: java-junit
output-to: 'checks'

10
.github/workflows/test-results-mac.yml vendored
View file

@ -18,13 +18,13 @@ jobs:
config: config:
- { - {
name: "Mac Test Results", name: "Mac Test Results",
runos: macos-latest, runos: macos-13,
artifact-name: "torque3dMacOSXCLANGUnitTest" artifact-name: "torque3dMacOSXCLANGUnitTest"
} }
steps: steps:
- name: Download Mac Test Report - name: Download Mac Test Report
uses: dawidd6/action-download-artifact@v2 uses: dawidd6/action-download-artifact@v3
with: with:
path: macOS path: macOS
name: ${{matrix.config.artifact-name}} name: ${{matrix.config.artifact-name}}
@ -32,10 +32,8 @@ jobs:
run_id: ${{ github.event.workflow_run.id }} run_id: ${{ github.event.workflow_run.id }}
- name: Test Reporter - name: Test Reporter
uses: phoenix-actions/test-reporting@v12 uses: phoenix-actions/test-reporting@v14
with: with:
artifact: ${{matrix.config.artifact-name}}
name: ${{matrix.config.name}} name: ${{matrix.config.name}}
path: "**/My Projects/Torque3D/game/test_detail.xml" path: macOS/*.xml
reporter: java-junit reporter: java-junit
output-to: 'checks'

8
.github/workflows/test-results-windows.yml vendored
View file

@ -24,7 +24,7 @@ jobs:
steps: steps:
- name: Download Windows Test Report - name: Download Windows Test Report
uses: dawidd6/action-download-artifact@v2 uses: dawidd6/action-download-artifact@v3
with: with:
path: Windows path: Windows
name: ${{matrix.config.artifact-name}} name: ${{matrix.config.artifact-name}}
@ -32,10 +32,8 @@ jobs:
run_id: ${{ github.event.workflow_run.id }} run_id: ${{ github.event.workflow_run.id }}
- name: Test Reporter - name: Test Reporter
uses: phoenix-actions/test-reporting@v12 uses: phoenix-actions/test-reporting@v14
with: with:
artifact: ${{matrix.config.artifact-name}}
name: ${{matrix.config.name}} name: ${{matrix.config.name}}
path: "**/My Projects/Torque3D/game/test_detail.xml" path: Windows/*.xml
reporter: java-junit reporter: java-junit
output-to: 'checks'