Skip to content

Commit a78b8b5

Browse files
committed
Fix Windows GHA build
1 parent ec54552 commit a78b8b5

3 files changed

Lines changed: 41 additions & 8 deletions

File tree

.github/workflows/main.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -205,8 +205,7 @@ jobs:
205205
- name: Configure CMake
206206
shell: cmd
207207
run: |
208-
copy CMakeUserPresets.json.windows.template CMakeUserPresets.json
209-
cmake --preset default
208+
cmake --preset windows-vs2026
210209
211210
- name: Upload vcpkg failure logs
212211
if: failure()
@@ -219,12 +218,12 @@ jobs:
219218
- name: Build
220219
shell: cmd
221220
run: |
222-
cmake --build --preset default
221+
cmake --build --preset windows-vs2026-debug
223222
224223
- name: Run tests
225224
shell: cmd
226225
run: |
227-
ctest --preset default --output-on-failure -j8
226+
ctest --preset windows-vs2026-debug --output-on-failure -j8
228227
229228
build-macos:
230229
runs-on: macos-latest

.github/workflows/pull-request.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,7 @@ jobs:
196196
- name: Configure CMake
197197
shell: cmd
198198
run: |
199-
copy CMakeUserPresets.json.windows.template CMakeUserPresets.json
200-
cmake --preset default
199+
cmake --preset windows-vs2026
201200
202201
- name: Upload vcpkg failure logs
203202
if: failure()
@@ -210,14 +209,14 @@ jobs:
210209
- name: Build
211210
shell: cmd
212211
run: |
213-
cmake --build --preset default
212+
cmake --build --preset windows-vs2026-debug
214213
215214
- name: Run tests
216215
shell: cmd
217216
run: |
218217
set ISC_USER=sysdba
219218
set ISC_PASSWORD=masterkey
220-
ctest --preset default --output-on-failure -j8
219+
ctest --preset windows-vs2026-debug --output-on-failure -j8
221220
222221
build-macos:
223222
runs-on: macos-latest

CMakePresets.json

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,21 @@
5151
"CMAKE_TOOLCHAIN_FILE": "${sourceDir}/vcpkg/scripts/buildsystems/vcpkg.cmake",
5252
"VCPKG_ROOT": "${sourceDir}/vcpkg"
5353
}
54+
},
55+
{
56+
"name": "windows-vs2026",
57+
"displayName": "Windows (Visual Studio 2026)",
58+
"description": "Multi-config build with the Visual Studio 18 2026 generator",
59+
"generator": "Visual Studio 18 2026",
60+
"architecture": {
61+
"value": "x64",
62+
"strategy": "external"
63+
},
64+
"binaryDir": "${sourceDir}/build",
65+
"cacheVariables": {
66+
"CMAKE_TOOLCHAIN_FILE": "${sourceDir}/vcpkg/scripts/buildsystems/vcpkg.cmake",
67+
"VCPKG_ROOT": "${sourceDir}/vcpkg"
68+
}
5469
}
5570
],
5671
"buildPresets": [
@@ -71,6 +86,16 @@
7186
"name": "windows-vs2022-release",
7287
"configurePreset": "windows-vs2022",
7388
"configuration": "Release"
89+
},
90+
{
91+
"name": "windows-vs2026-debug",
92+
"configurePreset": "windows-vs2026",
93+
"configuration": "Debug"
94+
},
95+
{
96+
"name": "windows-vs2026-release",
97+
"configurePreset": "windows-vs2026",
98+
"configuration": "Release"
7499
}
75100
],
76101
"testPresets": [
@@ -91,6 +116,16 @@
91116
"name": "windows-vs2022-release",
92117
"configurePreset": "windows-vs2022",
93118
"configuration": "Release"
119+
},
120+
{
121+
"name": "windows-vs2026-debug",
122+
"configurePreset": "windows-vs2026",
123+
"configuration": "Debug"
124+
},
125+
{
126+
"name": "windows-vs2026-release",
127+
"configurePreset": "windows-vs2026",
128+
"configuration": "Release"
94129
}
95130
]
96131
}

0 commit comments

Comments
 (0)