gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2026-05-08 10:59:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use Ninja on Unix platforms

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/create-release-artifacts.yml
+3 -3
View File
@@ -40,7 +40,7 @@ jobs:
run: | run: |
call .github\scripts\msvc-env.bat ${{ matrix.bits }} call .github\scripts\msvc-env.bat ${{ matrix.bits }}
cmake -S . -B build -G Ninja -DFETCHCONTENT_BASE_DIR="${{ env.DEPS_ROOT_DIR }}" cmake -S . -B build -G Ninja -DFETCHCONTENT_BASE_DIR="${{ env.DEPS_ROOT_DIR }}"
cmake --build build cmake --build build -- -k 0
- name: Package binaries - name: Package binaries
working-directory: build working-directory: build
run: | run: |
@@ -62,8 +62,8 @@ jobs:
./.github/scripts/install_deps.sh macos lld ./.github/scripts/install_deps.sh macos lld
- name: Build binaries - name: Build binaries
run: | run: |
cmake -S . -B build --preset macos-static -DFETCHCONTENT_BASE_DIR="${{ env.DEPS_ROOT_DIR }}" cmake -S . -B build -G Ninja --preset macos-static -DFETCHCONTENT_BASE_DIR="${{ env.DEPS_ROOT_DIR }}"
cmake --build build -- --output-sync --keep-going cmake --build build -- -k 0
strip rgb{asm,link,fix,gfx} strip rgb{asm,link,fix,gfx}
env: env:
LDFLAGS: -fuse-ld=lld # cmake/macos-static.cmake comments explain why we use lld. LDFLAGS: -fuse-ld=lld # cmake/macos-static.cmake comments explain why we use lld.
.github/workflows/testing.yml
+7 -7
View File
@@ -63,8 +63,8 @@ jobs:
# Note that since this is specific to our CI environment, the workaround is # 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. # better applied here than in our CMakeLists, where it could affect and break someone else.
run: | run: |
cmake -S . -B build --preset develop -DCMAKE_FIND_FRAMEWORK=LAST -DCMAKE_CXX_COMPILER=${{ matrix.cxx }} -DTESTS_OS_NAME=${{ matrix.os }} 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 --verbose -- --output-sync --keep-going cmake --build build -- -k 0
sudo cmake --install build --verbose sudo cmake --install build --verbose
- name: Package binaries - name: Package binaries
run: | run: |
@@ -122,8 +122,8 @@ jobs:
enableCrossOsArchive: true enableCrossOsArchive: true
- name: Build & install - name: Build & install
run: | run: |
cmake -S . -B build --preset macos-static -DFETCHCONTENT_BASE_DIR="${{ env.DEPS_ROOT_DIR }}" -DTESTS_OS_NAME=macos cmake -S . -B build -G Ninja --preset macos-static -DFETCHCONTENT_BASE_DIR="${{ env.DEPS_ROOT_DIR }}" -DTESTS_OS_NAME=macos
cmake --build build -- --output-sync --keep-going cmake --build build -- -k 0
env: env:
LDFLAGS: -fuse-ld=lld # cmake/macos-static.cmake comments explain why we use lld. LDFLAGS: -fuse-ld=lld # cmake/macos-static.cmake comments explain why we use lld.
- name: Package binaries - name: Package binaries
@@ -186,7 +186,7 @@ jobs:
call .github\scripts\msvc-env.bat ${{ matrix.bits }} call .github\scripts\msvc-env.bat ${{ matrix.bits }}
cmake -S . -B build -G Ninja --preset develop -DSANITIZERS=OFF ^ cmake -S . -B build -G Ninja --preset develop -DSANITIZERS=OFF ^
-DTESTS_OS_NAME=${{ matrix.os }} -DFETCHCONTENT_BASE_DIR="${{ env.DEPS_ROOT_DIR }}" -DTESTS_OS_NAME=${{ matrix.os }} -DFETCHCONTENT_BASE_DIR="${{ env.DEPS_ROOT_DIR }}"
cmake --build build cmake --build build -- -k 0
- name: Package binaries - name: Package binaries
working-directory: build working-directory: build
run: | run: |
@@ -243,9 +243,9 @@ jobs:
- name: Cross-build Windows binaries - name: Cross-build Windows binaries
run: | # MinGW does not support `--preset develop` sanitizers ASan or UBSan. 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) 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" -DFETCHCONTENT_BASE_DIR="${{ env.DEPS_ROOT_DIR }}" -DDLL_SEARCH_DIRS="$dll_search_dir"
cmake --build build cmake --build build -- -k 0
- name: Package binaries - name: Package binaries
run: | run: |
cmake --install build --prefix . --verbose --component binaries cmake --install build --prefix . --verbose --component binaries