diff options
| author | Martin Hořeňovský | 2022-12-30 22:16:28 +0100 |
|---|---|---|
| committer | Martin Hořeňovský | 2022-12-30 23:58:05 +0100 |
| commit | 72b60dfd28b403f3aef55465c0a29a9aa95b1cc7 (patch) | |
| tree | 1bcbc22b85a569bd06b8cc4c75eab88b17b96ab4 | |
| parent | 0c62167fea24b5e5752f40565f1ed176dc21a8dd (diff) | |
| download | catch3-72b60dfd28b403f3aef55465c0a29a9aa95b1cc7.tar.gz | |
Cleanup the Windows GHA builds
* Use CMD as the shell and simplify configure/build steps
* Include plaform in the build name
| -rw-r--r-- | .github/workflows/windows-simple-builds.yml | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/.github/workflows/windows-simple-builds.yml b/.github/workflows/windows-simple-builds.yml index 4093d5da..197fa219 100644 --- a/.github/workflows/windows-simple-builds.yml +++ b/.github/workflows/windows-simple-builds.yml @@ -4,7 +4,7 @@ on: [push, pull_request] jobs: build: - name: ${{matrix.os}}, ${{matrix.std}}, ${{matrix.build_type}} + name: ${{matrix.os}}, ${{matrix.std}}, ${{matrix.build_type}}, ${{matrix.platform}} runs-on: ${{matrix.os}} strategy: matrix: @@ -14,7 +14,7 @@ jobs: std: [14, 17] steps: - uses: actions/checkout@v2 - + - name: Configure build working-directory: ${{runner.workspace}} run: | @@ -23,17 +23,15 @@ jobs: -DCMAKE_CXX_STANDARD=${{matrix.std}} ` -A ${{matrix.platform}} ` --preset all-tests - + - name: Build tests working-directory: ${{runner.workspace}} - run: | - $jobs = (Get-CimInstance Win32_ComputerSystem).NumberOfLogicalProcessors - cmake --build build --config ${{matrix.build_type}} --parallel $jobs - + run: cmake --build build --config ${{matrix.build_type}} --parallel %NUMBER_OF_PROCESSORS% + shell: cmd + - name: Run tests working-directory: ${{runner.workspace}}/build env: CTEST_OUTPUT_ON_FAILURE: 1 - run: | - $jobs = (Get-CimInstance Win32_ComputerSystem).NumberOfLogicalProcessors - ctest -C ${{matrix.build_type}} -j $jobs + run: ctest -C ${{matrix.build_type}} -j %NUMBER_OF_PROCESSORS% + shell: cmd |