Skip to content

Commit afdf89f

Browse files
committed
fix not actually using variants
1 parent 911b213 commit afdf89f

File tree

2 files changed

+38
-14
lines changed

2 files changed

+38
-14
lines changed

.github/workflows/cmake-test.yml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
jobs:
1010
job:
11-
name: ${{ matrix.os }}-${{ matrix.os_version }}-${{ matrix.compiler }}-${{ matrix.build_type }}
11+
name: ${{ matrix.os }}-${{ matrix.os_version }}-${{ matrix.compiler }}-${{ matrix.variant }}
1212
runs-on: ${{ matrix.os }}-${{ matrix.os_version }}
1313

1414
strategy:
@@ -17,7 +17,7 @@ jobs:
1717
os: [macos, ubuntu, windows]
1818
os_version: [latest]
1919
compiler: [cl, clang++, g++]
20-
build_type: [debug, release]
20+
variant: [debug, release]
2121
include:
2222
- os: macos
2323
compiler: clang++
@@ -45,7 +45,6 @@ jobs:
4545

4646
env:
4747
CXX: ${{ matrix.compiler }}
48-
VCPKG_BUILD_TYPE: ${{ matrix.build_type }}
4948
VCPKG_DEFAULT_TRIPLET: ${{ matrix.triplet }}
5049
VCPKG_DISABLE_METRICS: true
5150

@@ -59,11 +58,11 @@ jobs:
5958
- uses: friendlyanon/setup-vcpkg@v1
6059
with:
6160
committish: 2025.12.12
62-
cache-key: vcpkg-${{ matrix.os }}-${{ matrix.os_version }}-${{ matrix.compiler }}-${{ matrix.build_type }}-${{ hashFiles('vcpkg.json', '.github/vcpkg_overlays/**') }}
61+
cache-key: vcpkg-${{ matrix.os }}-${{ matrix.os_version }}-${{ matrix.compiler }}-${{ matrix.variant }}-${{ hashFiles('vcpkg.json', '.github/vcpkg_overlays/**') }}
6362
ignore-reserve-cache-error: true
6463

65-
- run: cmake --preset default
66-
67-
- run: cmake --build --parallel --preset default
68-
69-
- run: ctest --preset default --output-on-failure
64+
- name: cmake
65+
run: |
66+
cmake --preset ${{ matrix.variant }}
67+
cmake --preset ${{ matrix.variant }} --build --parallel
68+
ctest --preset ${{ matrix.variant }} --output-on-failure

CMakePresets.json

Lines changed: 30 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,49 @@
77
},
88
"configurePresets": [
99
{
10-
"name": "default",
10+
"name": "release",
1111
"generator": "Ninja",
1212
"binaryDir": "${sourceDir}/build",
1313
"cacheVariables": {
14+
"CMAKE_BUILD_TYPE": "release",
15+
"CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake"
16+
}
17+
},
18+
{
19+
"name": "debug",
20+
"generator": "Ninja",
21+
"binaryDir": "${sourceDir}/build",
22+
"cacheVariables": {
23+
"CMAKE_BUILD_TYPE": "debug",
1424
"CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake"
1525
}
1626
}
1727
],
1828
"buildPresets": [
1929
{
20-
"name": "default",
21-
"configurePreset": "default"
30+
"name": "release",
31+
"configurePreset": "release"
32+
},
33+
{
34+
"name": "debug",
35+
"configurePreset": "debug"
2236
}
2337
],
2438
"testPresets": [
2539
{
26-
"name": "default",
27-
"configurePreset": "default",
40+
"name": "release",
41+
"configurePreset": "release",
42+
"output": {
43+
"outputOnFailure": true
44+
},
45+
"execution": {
46+
"noTestsAction": "error",
47+
"stopOnFailure": true
48+
}
49+
},
50+
{
51+
"name": "debug",
52+
"configurePreset": "debug",
2853
"output": {
2954
"outputOnFailure": true
3055
},

0 commit comments

Comments
 (0)