Skip to content

Commit 9e4d380

Browse files
TEMP: Try to use MSVC generator in CI.
Trying to replicate #1237. DO NOT MERGE, as this will likely break sccache!
1 parent 64d4ee6 commit 9e4d380

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

.github/workflows/github-cxx-qt-tests.yml

+8-1
Original file line numberDiff line numberDiff line change
@@ -285,6 +285,7 @@ jobs:
285285
clang_format_path: /home/runner/.local/bin/clang-format
286286
cargo_dir: ~/.cargo
287287
rustc_wrapper: sccache
288+
cmake_generator: Ninja
288289
- name: Ubuntu 24.04 (gcc) Qt6
289290
os: ubuntu-24.04
290291
qt_version: 6
@@ -301,6 +302,7 @@ jobs:
301302
clang_format_path: /home/runner/.local/bin/clang-format
302303
cargo_dir: ~/.cargo
303304
rustc_wrapper: sccache
305+
cmake_generator: Ninja
304306
packages-extra: >-
305307
libgl1-mesa-dev
306308
libvulkan-dev
@@ -327,6 +329,7 @@ jobs:
327329
cc: clang
328330
cxx: clang++
329331
rustc_wrapper: sccache
332+
cmake_generator: Ninja
330333
- name: macOS 14 (clang) Qt6
331334
os: macos-14
332335
qt_version: 6
@@ -348,6 +351,7 @@ jobs:
348351
cc: clang
349352
cxx: clang++
350353
rustc_wrapper: sccache
354+
cmake_generator: Ninja
351355

352356
- name: Windows 2022 (MSVC) Qt5
353357
os: windows-2022
@@ -366,6 +370,7 @@ jobs:
366370
cc: cl
367371
cxx: cl
368372
rustc_wrapper: sccache
373+
cmake_generator: "\"Visual Studio 16 2019\""
369374
- name: Windows 2022 (MSVC2019) Qt6
370375
os: windows-2022
371376
qt_version: 6
@@ -383,6 +388,7 @@ jobs:
383388
cc: cl
384389
cxx: cl
385390
rustc_wrapper: sccache
391+
cmake_generator: "\"Visual Studio 17 2022 -A Win64\""
386392
- name: Windows 2022 (MSVC2022) Qt6
387393
os: windows-2022
388394
qt_version: 6
@@ -400,6 +406,7 @@ jobs:
400406
cc: cl
401407
cxx: cl
402408
rustc_wrapper: sccache
409+
cmake_generator: "\"Visual Studio 17 2022 -A Win64\""
403410

404411
runs-on: ${{ matrix.os }}
405412
name: ${{ matrix.name }}
@@ -537,7 +544,7 @@ jobs:
537544
cmake ${{ matrix.cmake_args }}
538545
-D USE_QT5=${{ matrix.qt_version == 5 }}
539546
-D CMAKE_BUILD_TYPE=Release
540-
-G Ninja
547+
-G ${{ matrix.cmake_generator }}
541548
-S . -B build
542549
env:
543550
RUSTC_WRAPPER: ${{ matrix.rustc_wrapper }}

0 commit comments

Comments
 (0)