From a9df89bda908e3b3d443db7f3ca865b6f12c75e5 Mon Sep 17 00:00:00 2001 From: Thorbjørn Lindeijer Date: Mon, 4 Mar 2024 20:31:08 +0100 Subject: CI: Use Ninja to speed up compile times Ninja should automatically run the appropriate amount of parallel jobs. Also removed the --parallel from the README.md, since the default generator (Unix Makefiles) is not smart about this and risks locking up people's systems because the many compile jobs can make it run out of memory. --- .gitlab-ci.yml | 5 +++-- README.md | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6e19fbc7..d539ecc9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,5 +23,6 @@ ubuntu-build: libsdl2-net-dev libsdl2-ttf-dev libxml2-dev - - cmake . - - cmake --build . + ninja-build + - cmake -G Ninja -B build . + - cmake --build build diff --git a/README.md b/README.md index 14e03fb1..605b682c 100644 --- a/README.md +++ b/README.md @@ -131,7 +131,7 @@ Installing the dependencies on Fedora: Once the dependencies are installed, use CMake: cmake -B build . - cmake --build build --parallel + cmake --build build This produces an executable in `build/src/mana`. If running it without installing, be sure to run it from the repository root so that it can find its -- cgit v1.2.3-70-g09d2