From e7aeda65cc87bc0b525963ba2c0277de12bfee9f Mon Sep 17 00:00:00 2001 From: Joel Falcou Date: Fri, 2 Feb 2024 19:08:01 +0100 Subject: [PATCH] Reinstate MSVC tests on new runners --- .github/workflows/unit.yml | 53 +++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 27 deletions(-) diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml index eafd824893..932716b112 100644 --- a/.github/workflows/unit.yml +++ b/.github/workflows/unit.yml @@ -73,34 +73,33 @@ jobs: ################################################################################################## ## Windows Targets ################################################################################################## - # msvc: - # runs-on: [windows-2022] - # strategy: - # fail-fast: false - # matrix: - # cfg: - # - { mode: Debug, options: "-DEVE_NO_FORCEINLINE"} - # - { mode: Release, options: ""} + msvc: + runs-on: [windows-2022] + strategy: + fail-fast: false + matrix: + cfg: + - { mode: Debug, options: "-DEVE_NO_FORCEINLINE"} - # steps: - # - name: Fetch current branch - # uses: actions/checkout@v3 - # - name: Running CMake for MSVC ${{ matrix.cfg.mode }} ${{ matrix.cfg.options }} - # run: | - # mkdir build && cd build - # cmake -G "Visual Studio 17 2022" -A x64 .. -DCMAKE_CXX_FLAGS="${{ matrix.cfg.options }}" - # - name: Compiling Unit Tests - # run: | - # cd build - # cmake --build . --target unit.arch.exe --config ${{ matrix.cfg.mode }} --parallel 2 - # cmake --build . --target unit.meta.exe --config ${{ matrix.cfg.mode }} --parallel 2 - # cmake --build . --target unit.internals.exe --config ${{ matrix.cfg.mode }} --parallel 2 - # - name: Running Tests - # run: | - # cd build - # ctest -C ${{ matrix.cfg.mode }} --output-on-failure -R ^unit.arch.*.exe - # ctest -C ${{ matrix.cfg.mode }} --output-on-failure -R ^unit.meta.*.exe - # ctest -C ${{ matrix.cfg.mode }} --output-on-failure -R ^unit.internals.*.exe + steps: + - name: Fetch current branch + uses: actions/checkout@v3 + - name: Running CMake for MSVC ${{ matrix.cfg.mode }} ${{ matrix.cfg.options }} + run: | + mkdir build && cd build + cmake -G "Visual Studio 17 2022" -A x64 .. -DCMAKE_CXX_FLAGS="${{ matrix.cfg.options }}" + - name: Compiling Unit Tests + run: | + cd build + cmake --build . --target unit.arch.exe --config ${{ matrix.cfg.mode }} --parallel 2 + cmake --build . --target unit.meta.exe --config ${{ matrix.cfg.mode }} --parallel 2 + cmake --build . --target unit.internals.exe --config ${{ matrix.cfg.mode }} --parallel 2 + - name: Running Tests + run: | + cd build + ctest -C ${{ matrix.cfg.mode }} --output-on-failure -R ^unit.arch.*.exe + ctest -C ${{ matrix.cfg.mode }} --output-on-failure -R ^unit.meta.*.exe + ctest -C ${{ matrix.cfg.mode }} --output-on-failure -R ^unit.internals.*.exe ################################################################################################## ## X86 Targets