diff --git a/.github/workflows/actions/upload-artifact/action.yml b/.github/workflows/actions/upload-artifact/action.yml index 9042dd1e4..624096c7c 100644 --- a/.github/workflows/actions/upload-artifact/action.yml +++ b/.github/workflows/actions/upload-artifact/action.yml @@ -12,7 +12,7 @@ runs: using: "composite" steps: - name: Upload Torque Test Report - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v3.1.2 with: name: ${{inputs.name}} path: ${{inputs.path}} diff --git a/.github/workflows/build-windows-msvc.yml b/.github/workflows/build-windows-msvc.yml index ae7aad6ce..83a9a9c1f 100644 --- a/.github/workflows/build-windows-msvc.yml +++ b/.github/workflows/build-windows-msvc.yml @@ -1,4 +1,4 @@ -name: Windows Build MSVC +name: Windows Build on: push: branches: [development] @@ -47,20 +47,24 @@ jobs: cmake --version cmd "${{matrix.config.environment_script}}" - - name: Configure Build - uses: ashutoshvarma/action-cmake-build@v1 - with: - build-dir: ${{github.workspace}}/build - # will set the CC & CXX for cmake - 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: false - # run build using '-j [parallel]' to use multiple threads to build - parallel: 14 + - name: Configure + shell: bash + run: | + mkdir build + cmake \ + -S ${{github.workspace}} \ + -B ${{github.workspace}}/build \ + -DCMAKE_BUILD_TYPE=${{ matrix.config.build_type }} \ + -G "${{ matrix.config.generators }}" \ + -DTORQUE_APP_NAME=Torque3D -DTORQUE_TESTING=ON + + - name: Build + shell: bash + run: cmake --build . --config ${{ matrix.config.build_type }} + + - name: Install Strip + shell: bash + run: cmake --install - name: Install run: cmake --install