Use Ninja on Unix platforms

It has nicer UX, only showing full command lines when they fail.
It could also be slightly faster, though I've seen no measurable improvement.
This commit is contained in:
ISSOtm
2026-04-15 00:32:19 +02:00
committed by Rangi
parent 59dd1fbbf8
commit 71fc449452
2 changed files with 10 additions and 10 deletions
@@ -40,7 +40,7 @@ jobs:
run: |
call .github\scripts\msvc-env.bat ${{ matrix.bits }}
cmake -S . -B build -G Ninja -DFETCHCONTENT_BASE_DIR="${{ env.DEPS_ROOT_DIR }}"
cmake --build build
cmake --build build -- -k 0
- name: Package binaries
working-directory: build
run: |
@@ -62,8 +62,8 @@ jobs:
./.github/scripts/install_deps.sh macos lld
- name: Build binaries
run: |
cmake -S . -B build --preset macos-static -DFETCHCONTENT_BASE_DIR="${{ env.DEPS_ROOT_DIR }}"
cmake --build build -- --output-sync --keep-going
cmake -S . -B build -G Ninja --preset macos-static -DFETCHCONTENT_BASE_DIR="${{ env.DEPS_ROOT_DIR }}"
cmake --build build -- -k 0
strip rgb{asm,link,fix,gfx}
env:
LDFLAGS: -fuse-ld=lld # cmake/macos-static.cmake comments explain why we use lld.
+7 -7
View File
@@ -63,8 +63,8 @@ jobs:
# Note that since this is specific to our CI environment, the workaround is
# better applied here than in our CMakeLists, where it could affect and break someone else.
run: |
cmake -S . -B build --preset develop -DCMAKE_FIND_FRAMEWORK=LAST -DCMAKE_CXX_COMPILER=${{ matrix.cxx }} -DTESTS_OS_NAME=${{ matrix.os }}
cmake --build build --verbose -- --output-sync --keep-going
cmake -S . -B build -G Ninja --preset develop -DCMAKE_FIND_FRAMEWORK=LAST -DCMAKE_CXX_COMPILER=${{ matrix.cxx }} -DTESTS_OS_NAME=${{ matrix.os }}
cmake --build build -- -k 0
sudo cmake --install build --verbose
- name: Package binaries
run: |
@@ -122,8 +122,8 @@ jobs:
enableCrossOsArchive: true
- name: Build & install
run: |
cmake -S . -B build --preset macos-static -DFETCHCONTENT_BASE_DIR="${{ env.DEPS_ROOT_DIR }}" -DTESTS_OS_NAME=macos
cmake --build build -- --output-sync --keep-going
cmake -S . -B build -G Ninja --preset macos-static -DFETCHCONTENT_BASE_DIR="${{ env.DEPS_ROOT_DIR }}" -DTESTS_OS_NAME=macos
cmake --build build -- -k 0
env:
LDFLAGS: -fuse-ld=lld # cmake/macos-static.cmake comments explain why we use lld.
- name: Package binaries
@@ -186,7 +186,7 @@ jobs:
call .github\scripts\msvc-env.bat ${{ matrix.bits }}
cmake -S . -B build -G Ninja --preset develop -DSANITIZERS=OFF ^
-DTESTS_OS_NAME=${{ matrix.os }} -DFETCHCONTENT_BASE_DIR="${{ env.DEPS_ROOT_DIR }}"
cmake --build build
cmake --build build -- -k 0
- name: Package binaries
working-directory: build
run: |
@@ -243,9 +243,9 @@ jobs:
- name: Cross-build Windows binaries
run: | # MinGW does not support `--preset develop` sanitizers ASan or UBSan.
dll_search_dir=$(printf '%s\n' /usr/lib/gcc/*-w64-mingw32/*-win32 | tee -a /dev/stderr)
cmake -B build --preset develop -DSANITIZERS=OFF --toolchain cmake/toolchain-mingw${{ matrix.bits }}.cmake \
cmake -B build -G Ninja --preset develop -DSANITIZERS=OFF --toolchain cmake/toolchain-mingw${{ matrix.bits }}.cmake \
-DFETCHCONTENT_BASE_DIR="${{ env.DEPS_ROOT_DIR }}" -DDLL_SEARCH_DIRS="$dll_search_dir"
cmake --build build
cmake --build build -- -k 0
- name: Package binaries
run: |
cmake --install build --prefix . --verbose --component binaries