Skip to content

Commit 91dfd72

Browse files
committed
Fix Windows GHA build
1 parent e1ee4ec commit 91dfd72

5 files changed

Lines changed: 44 additions & 11 deletions

File tree

.github/workflows/main.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,8 @@ jobs:
205205
- name: Configure CMake
206206
shell: cmd
207207
run: |
208-
cmake --preset windows-vs2026
208+
copy CMakeUserPresets.json.windows-vs2026.template CMakeUserPresets.json
209+
cmake --preset default
209210
210211
- name: Upload vcpkg failure logs
211212
if: failure()
@@ -218,12 +219,12 @@ jobs:
218219
- name: Build
219220
shell: cmd
220221
run: |
221-
cmake --build --preset windows-vs2026-debug
222+
cmake --build --preset default
222223
223224
- name: Run tests
224225
shell: cmd
225226
run: |
226-
ctest --preset windows-vs2026-debug --output-on-failure -j8
227+
ctest --preset default --output-on-failure -j8
227228
228229
build-macos:
229230
runs-on: macos-latest

.github/workflows/pull-request.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,8 @@ jobs:
196196
- name: Configure CMake
197197
shell: cmd
198198
run: |
199-
cmake --preset windows-vs2026
199+
copy CMakeUserPresets.json.windows-vs2026.template CMakeUserPresets.json
200+
cmake --preset default
200201
201202
- name: Upload vcpkg failure logs
202203
if: failure()
@@ -209,14 +210,12 @@ jobs:
209210
- name: Build
210211
shell: cmd
211212
run: |
212-
cmake --build --preset windows-vs2026-debug
213+
cmake --build --preset default
213214
214215
- name: Run tests
215216
shell: cmd
216217
run: |
217-
set ISC_USER=sysdba
218-
set ISC_PASSWORD=masterkey
219-
ctest --preset windows-vs2026-debug --output-on-failure -j8
218+
ctest --preset default --output-on-failure -j8
220219
221220
build-macos:
222221
runs-on: macos-latest

CMakeUserPresets.json.windows.template renamed to CMakeUserPresets.json.windows-vs2022.template

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
],
2525
"environment": {
2626
"FBCPP_TEST_SERVER": "localhost",
27-
"ISC_USER": "sysdba",
28-
"ISC_PASSWORD": "masterkey"
27+
"ISC_USER": "sysdba",
28+
"ISC_PASSWORD": "masterkey"
2929
}
3030
}
3131
]
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
{
2+
"version": 3,
3+
"configurePresets": [
4+
{
5+
"name": "default",
6+
"inherits": [
7+
"windows-vs2026"
8+
]
9+
}
10+
],
11+
"buildPresets": [
12+
{
13+
"name": "default",
14+
"inherits": [
15+
"windows-vs2026-debug"
16+
]
17+
}
18+
],
19+
"testPresets": [
20+
{
21+
"name": "default",
22+
"inherits": [
23+
"windows-vs2026-debug"
24+
],
25+
"environment": {
26+
"FBCPP_TEST_SERVER": "localhost",
27+
"ISC_USER": "sysdba",
28+
"ISC_PASSWORD": "masterkey"
29+
}
30+
}
31+
]
32+
}

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,8 @@ The default features are:
108108
This project uses CMake presets (`CMakePresets.json`) and vcpkg for dependency management.
109109

110110
Copy the appropriate `CMakeUserPresets.json.<platform>.template` file to `CMakeUserPresets.json` to set environment
111-
variables for tests and define the default preset.
111+
variables for tests and define the default preset. On Windows, use either `CMakeUserPresets.json.windows-vs2022.template`
112+
or `CMakeUserPresets.json.windows-vs2026.template`.
112113

113114
```bash
114115
# Configure

0 commit comments

Comments
 (0)