mirror of
https://github.com/catchorg/Catch2.git
synced 2024-11-22 05:16:10 +01:00
Cleanup the Windows GHA builds
* Use CMD as the shell and simplify configure/build steps * Include plaform in the build name
This commit is contained in:
parent
0c62167fea
commit
72b60dfd28
18
.github/workflows/windows-simple-builds.yml
vendored
18
.github/workflows/windows-simple-builds.yml
vendored
@ -4,7 +4,7 @@ on: [push, pull_request]
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
name: ${{matrix.os}}, ${{matrix.std}}, ${{matrix.build_type}}
|
name: ${{matrix.os}}, ${{matrix.std}}, ${{matrix.build_type}}, ${{matrix.platform}}
|
||||||
runs-on: ${{matrix.os}}
|
runs-on: ${{matrix.os}}
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
@ -14,7 +14,7 @@ jobs:
|
|||||||
std: [14, 17]
|
std: [14, 17]
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
|
|
||||||
- name: Configure build
|
- name: Configure build
|
||||||
working-directory: ${{runner.workspace}}
|
working-directory: ${{runner.workspace}}
|
||||||
run: |
|
run: |
|
||||||
@ -23,17 +23,15 @@ jobs:
|
|||||||
-DCMAKE_CXX_STANDARD=${{matrix.std}} `
|
-DCMAKE_CXX_STANDARD=${{matrix.std}} `
|
||||||
-A ${{matrix.platform}} `
|
-A ${{matrix.platform}} `
|
||||||
--preset all-tests
|
--preset all-tests
|
||||||
|
|
||||||
- name: Build tests
|
- name: Build tests
|
||||||
working-directory: ${{runner.workspace}}
|
working-directory: ${{runner.workspace}}
|
||||||
run: |
|
run: cmake --build build --config ${{matrix.build_type}} --parallel %NUMBER_OF_PROCESSORS%
|
||||||
$jobs = (Get-CimInstance Win32_ComputerSystem).NumberOfLogicalProcessors
|
shell: cmd
|
||||||
cmake --build build --config ${{matrix.build_type}} --parallel $jobs
|
|
||||||
|
|
||||||
- name: Run tests
|
- name: Run tests
|
||||||
working-directory: ${{runner.workspace}}/build
|
working-directory: ${{runner.workspace}}/build
|
||||||
env:
|
env:
|
||||||
CTEST_OUTPUT_ON_FAILURE: 1
|
CTEST_OUTPUT_ON_FAILURE: 1
|
||||||
run: |
|
run: ctest -C ${{matrix.build_type}} -j %NUMBER_OF_PROCESSORS%
|
||||||
$jobs = (Get-CimInstance Win32_ComputerSystem).NumberOfLogicalProcessors
|
shell: cmd
|
||||||
ctest -C ${{matrix.build_type}} -j $jobs
|
|
||||||
|
Loading…
Reference in New Issue
Block a user