ci: use ninja in Windows builds

This commit is contained in:
Bruno Alexandre Rosa 2026-03-17 15:18:39 -03:00
parent fc453c68a7
commit 00e634f1db
6 changed files with 16 additions and 18 deletions

View file

@ -320,8 +320,7 @@ jobs:
qt_version: 6.10.*
qt_arch: win64_msvc2022_64
qt_modules: qtimageformats qtmultimedia qtwebsockets
cmake_generator: "Visual Studio 17 2022"
cmake_generator_platform: x64
cmake_generator: Ninja
name: ${{matrix.os}} ${{matrix.target}}${{ matrix.soc == 'Intel' && ' Intel' || '' }}${{ matrix.type == 'Debug' && ' Debug' || '' }}
needs: configure
@ -338,12 +337,10 @@ jobs:
with:
submodules: recursive
- name: Add msbuild to PATH
# Set relevant environment variables for MSVC, used to ensure ninja + MSVC build correctly together
- name: Setup MSVC (Windows)
if: matrix.os == 'Windows'
id: add-msbuild
uses: microsoft/setup-msbuild@v2
with:
msbuild-architecture: x64
uses: ilammy/msvc-dev-cmd@v1.13.0
- name: Setup ccache
if: matrix.use_ccache == 1 && matrix.os == 'macOS'
@ -429,7 +426,6 @@ jobs:
MAKE_PACKAGE: '${{matrix.make_package}}'
PACKAGE_SUFFIX: '${{matrix.package_suffix}}'
CMAKE_GENERATOR: ${{matrix.cmake_generator}}
CMAKE_GENERATOR_PLATFORM: ${{matrix.cmake_generator_platform}}
USE_CCACHE: ${{matrix.use_ccache}}
VCPKG_DISABLE_METRICS: 1
VCPKG_BINARY_SOURCES: 'clear;files,${{ steps.vcpkg-cache.outputs.path }},readwrite'
@ -516,9 +512,9 @@ jobs:
with:
name: ${{steps.build.outputs.name}}-PDBs
path: |
build/cockatrice/Release/*.pdb
build/oracle/Release/*.pdb
build/servatrice/Release/*.pdb
build/cockatrice/**/*.pdb
build/oracle/**/*.pdb
build/servatrice/**/*.pdb
if-no-files-found: error
- name: Upload to release