Prechádzať zdrojové kódy

windows unit testing

-removed the other 2 platforms just for now
marauder2k7 2 rokov pred
rodič
commit
a4a77ee68a

+ 0 - 76
.github/workflows/build-linux-gcc.yml

@@ -1,76 +0,0 @@
-name: Linux Build GCC
-on:
-    push:
-        branches: [development]
-    pull_request:
-        branches: [development]
-env:
-    build_type: "Release"
-    cc: "gcc"
-    cxx: "g++"
-
-concurrency:
-    group: ci-${{github.actor}}-${{github.head_ref || github.run_number}}-${{github.ref}}-linux
-    cancel-in-progress: true
-jobs:
-    build-linux:
-        if: github.repository == 'TorqueGameEngines/Torque3D'
-        name: Linux Ubuntu Latest GCC
-        runs-on: ubuntu-latest
-        strategy:
-            fail-fast: false
-        steps:
-            - uses: actions/checkout@v3
-            - name: Print env
-              run: |
-                echo github.event.action: ${{ github.event.action }}
-                echo github.event_name: ${{ github.event_name }}
-
-            - name: Setup GCC problem matcher
-              uses: ammaraskar/gcc-problem-matcher@master
-
-            - name: Install Linux Dependencies
-              run: |
-                sudo apt-get update && \
-                sudo apt-get install -y \
-                    build-essential \
-                    nasm \
-                    libogg-dev \
-                    libxft-dev \
-                    libx11-dev \
-                    libxxf86vm-dev \
-                    libopenal-dev \
-                    libfreetype6-dev \
-                    libxcursor-dev \
-                    libxinerama-dev \
-                    libxi-dev \
-                    libxrandr-dev \
-                    libxss-dev \
-                    libglu1-mesa-dev \
-                    libgtk-3-dev
-
-            - name: Configure Build & Install
-              uses: ashutoshvarma/action-cmake-build@v1
-              with:
-                build-dir: ${{github.workspace}}/build
-                # will set the CC & CXX for cmake
-                cc: ${{env.cc}}
-                cxx: ${{env.cxx}}
-                build-type: ${{env.build_type}} 
-                # Extra options pass to cmake while configuring project
-                configure-options: -DTORQUE_APP_NAME=Torque3D -DTORQUE_TESTING=ON
-                # install the build using cmake --install
-                install-build: true
-                # run build using '-j [parallel]' to use multiple threads to build
-                parallel: 14
-
-            - name: Unit Tests
-              shell: bash
-              run: |
-                cd "${{github.workspace}}/My Projects/Torque3D/game"
-                ./Torque3D runTests.tscript
-
-            - name: Upload Artifact
-              uses: ./.github/actions/upload-artifact
-              with:
-                name: torque3dLinuxGCCUnitTest

+ 0 - 57
.github/workflows/build-macos-clang.yml

@@ -1,57 +0,0 @@
-name: MacOSX Build CLANG
-on:
-    push:
-        branches: [development]
-    pull_request:
-        branches: [development]
-env:
-    build_type: "Release"
-    cc: "clang"
-    cxx: "clang++"
-
-concurrency:
-    group: ci-${{github.actor}}-${{github.head_ref || github.run_number}}-${{github.ref}}-macosx
-    cancel-in-progress: true
-jobs:
-    build-linux:
-        if: github.repository == 'TorqueGameEngines/Torque3D'
-        name: MacOSX Latest CLANG
-        runs-on: macos-latest
-        strategy:
-            fail-fast: false
-        steps:
-            - uses: actions/checkout@v3
-            - name: Print env
-              run: |
-                echo github.event.action: ${{ github.event.action }}
-                echo github.event_name: ${{ github.event_name }}
-
-            - name: Install MacOSX Dependencies
-              run: |
-                cmake --version
-
-            - name: Configure Build & Install
-              uses: ashutoshvarma/action-cmake-build@v1
-              with:
-                build-dir: ${{github.workspace}}/build
-                # will set the CC & CXX for cmake
-                cc: ${{env.cc}}
-                cxx: ${{env.cxx}}
-                build-type: ${{env.build_type}} 
-                # Extra options pass to cmake while configuring project
-                configure-options: -DTORQUE_APP_NAME=Torque3D -DTORQUE_TESTING=ON
-                # install the build using cmake --install
-                install-build: true
-                # run build using '-j [parallel]' to use multiple threads to build
-                parallel: 14
-
-            - name: Unit Tests
-              shell: bash
-              run: |
-                cd "${{github.workspace}}/My Projects/Torque3D/game"
-                ./Torque3D.app/Contents/MacOS/Torque3D runTests.tscript
-
-            - name: Upload Artifact
-              uses: ./.github/actions/upload-artifact
-              with:
-                name: torque3dMacOSXCLANGUnitTest

+ 30 - 17
.github/workflows/build-windows-msvc.yml

@@ -4,12 +4,6 @@ on:
         branches: [development]
     pull_request:
         branches: [development]
-env:
-    build_type: "Release"
-    cc: "cl"
-    cxx: "cl"
-    environment_script: "C:/Program Files (x86)/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars64.bat"
-
 concurrency:
     group: ci-${{github.actor}}-${{github.head_ref || github.run_number}}-${{github.ref}}-windows
     cancel-in-progress: true
@@ -20,6 +14,25 @@ jobs:
         runs-on: windows-latest
         strategy:
             fail-fast: false
+            matrix:
+              config: 
+              - {
+                  name: "Windows Latest MSVC",
+                  os: windows-latest,
+                  build_type: "Release",
+                  cc: "cl",
+                  cxx: "cl",
+                  environment_script: "C:/Program Files (x86)/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars64.bat",
+                  generator: "Visual Studio 17 2022"
+                }
+              - {
+                  name: "Windows Latest MinGW",
+                  os: windows-latest,
+                  build_type: "Release",
+                  cc: "gcc",
+                  cxx: "g++",
+                  generator: "Ninja"
+                }
         steps:
             - uses: actions/checkout@v3
             - uses: ilammy/msvc-dev-cmd@v1
@@ -31,31 +44,31 @@ jobs:
             - name: Setup MSVC problem matcher
               uses: ammaraskar/msvc-problem-matcher@master
 
-            - name: Install Windows MSVC Dependencies
+            - name: Install Dependencies For ${{matrix.config.name}}
               run: |
                 cmake --version
-                cmd "${{env.environment_script}}"
+                cmd "${{matrix.config.environment_script}}"
 
-            - name: Configure Build & Install
+            - name: Configure Build
               uses: ashutoshvarma/action-cmake-build@v1
               with:
                 build-dir: ${{github.workspace}}/build
                 # will set the CC & CXX for cmake
-                cc: ${{env.cc}}
-                cxx: ${{env.cxx}}
-                build-type: ${{env.build_type}} 
+                cc: ${{matrix.config.cc}}
+                cxx: ${{matrix.config.cxx}}
+                build-type: ${{matrix.config.build_type}} 
                 # Extra options pass to cmake while configuring project
                 configure-options: -DTORQUE_APP_NAME=Torque3D -DTORQUE_TESTING=ON
                 # install the build using cmake --install
-                install-build: true
+                install-build: false
                 # run build using '-j [parallel]' to use multiple threads to build
                 parallel: 14
 
+            - name: Install
+              run: cmake --install
+
             - name: Unit Tests
-              shell: bash
-              run: |
-                cd "${{github.workspace}}/My Projects/Torque3D/game"
-                ./Torque3D.exe runTests.tscript
+              run: ${{github.workspace}}/My Projects/Torque3D/game/Torque3D.exe runTests.tscript
 
             - name: Upload Artifact
               uses: ./.github/actions/upload-artifact

+ 0 - 44
.github/workflows/test-results.yml

@@ -1,44 +0,0 @@
-name: Report Test Results
-on:
-  workflow_run:
-    workflows: [ "CMake" ]
-    types: [ completed ]
-
-permissions:
-  checks: write
-
-jobs:
-  checks:
-    runs-on: ubuntu-latest
-    steps:
-      # 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:
-          path: Windows
-          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:
-          path: Linux
-          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:
-          path: macOS
-          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: '**/My Projects/Torque3D/game/test_detail.xml'