Skip to content

Commit

Permalink
Github CI: the windows-2022 runner does not have ninja installed
Browse files Browse the repository at this point in the history
  • Loading branch information
rgriebl committed Oct 9, 2024
1 parent 756bfdd commit 70a6aa6
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/build_cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
qt_version: '6.8.0'
qt_arch: 'win64_msvc2022_64'
qt_dir: "msvc2022_64"
environment_script: "C:/Program Files (x86)/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars64.bat"
environment_script: "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars64.bat"
cmake_extra_config: '-DSENTRY=ON'

- name: "Windows ARM 64bit"
Expand All @@ -63,7 +63,7 @@ jobs:
qt_version: '6.8.0'
qt_arch: 'win64_msvc2022_arm64_cross_compiled'
qt_dir: "msvc2022_arm64"
environment_script: "C:/Program Files (x86)/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvarsamd64_arm64.bat"
environment_script: "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvarsamd64_arm64.bat"
cmake_extra_config: '-DCMAKE_TOOLCHAIN_FILE=%Qt6_DIR%/lib/cmake/Qt6/qt.toolchain.cmake -DQT_HOST_PATH=%Qt6_DIR%/../msvc2022_64'

- name: "Ubuntu 22.04"
Expand Down Expand Up @@ -263,6 +263,7 @@ jobs:
- name: Build for Windows
if: (matrix.config.os == 'windows')
run: |
choco install ninja
call "${{ matrix.config.environment_script }}"
call %Qt6_DIR%\bin\qt-cmake.bat -G Ninja -DCMAKE_BUILD_TYPE=RelWithDebInfo ${{ matrix.config.cmake_extra_config }} -B build -S .
cmake --build build --config RelWithDebInfo --parallel --target installer --verbose
Expand Down

0 comments on commit 70a6aa6

Please sign in to comment.