Skip to content

Commit d1a050d

Browse files
committed
update
1 parent f74aa06 commit d1a050d

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

.github/workflows/main.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,17 @@ jobs:
1919
- { name: 'windows: clang64', os: 'windows-latest', shell: 'msys2 {0}', msys2: true, msystem: 'clang64', msys-env: 'mingw-w64-clang-x86_64' }
2020
- { name: 'windows: ucrt64', os: 'windows-latest', shell: 'msys2 {0}', msys2: true, msystem: 'ucrt64', msys-env: 'mingw-w64-ucrt-x86_64'}
2121
- { name: 'windows: MSVC (vcvars)', os: 'windows-latest', shell: 'pwsh', msvc: true, msvc_arch: x64 }
22-
- { name: 'windows: MSVC (args)', os: 'windows-latest', shell: 'pwsh', msvc: false, cmake-arguments: '-A Win32'}
22+
- { name: 'windows: MSVC (args)', os: 'windows-latest', shell: 'pwsh', msvc: false, msvc_arch: Win32 } #cmake-arguments: '-A Win32'}
2323
- { name: 'linux: MinGW', os: 'ubuntu-latest', shell: 'bash', cmake-toolchain-file: 'cmake/mingw64.cmake', apt-packages: 'mingw-w64'}
2424
- { name: 'macos: default', os: 'macos-latest', shell: 'sh', }
2525
steps:
2626
- uses: ilammy/msvc-dev-cmd@v1
2727
if: ${{ matrix.platform.msvc }}
2828
with:
2929
arch: ${{ matrix.platform.msvc_arch }}
30+
- name: Set up ninja
31+
if: ${{ !matrix.platform.msystem }}
32+
uses: ./.github/actions/setup-ninja
3033
- name: Set up MSYS2
3134
if: ${{ matrix.platform.msys2 }}
3235
uses: msys2/setup-msys2@v2
@@ -56,11 +59,12 @@ jobs:
5659
shell: ${{ matrix.platform.shell }}
5760
cmake-arguments: ${{ matrix.platform.cmake-arguments }}
5861
cmake-toolchain-file: ${{ matrix.platform.cmake-toolchain-file }}
62+
cmake-generator: Ninja
5963
install-linux-dependencies: true
6064
sdl-test: true
6165
- name: Configure (CMake)
6266
run: |
63-
cmake -S . -B build ${{ matrix.platform.cmake-arguments }} -DCMAKE_TOOLCHAIN_FILE=${{ matrix.platform.cmake-toolchain-file }}
67+
cmake -S . -B build -GNinja ${{ matrix.platform.cmake-arguments }} -DCMAKE_TOOLCHAIN_FILE=${{ matrix.platform.cmake-toolchain-file }}
6468
- name: Build (CMake)
6569
run: |
6670
cmake --build build

0 commit comments

Comments
 (0)