summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <bjorn@lindeijer.nl>2024-03-04 20:31:08 +0100
committerThorbjørn Lindeijer <bjorn@lindeijer.nl>2024-03-04 20:03:31 +0000
commita9df89bda908e3b3d443db7f3ca865b6f12c75e5 (patch)
treeada951b04db6a0026ca43fb17b666426a10a9d63
parent5c7f9d1d216fd1edca231ed274ac3077cb34909f (diff)
downloadMana-a9df89bda908e3b3d443db7f3ca865b6f12c75e5.tar.gz
Mana-a9df89bda908e3b3d443db7f3ca865b6f12c75e5.tar.bz2
Mana-a9df89bda908e3b3d443db7f3ca865b6f12c75e5.tar.xz
Mana-a9df89bda908e3b3d443db7f3ca865b6f12c75e5.zip
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.
-rw-r--r--.gitlab-ci.yml5
-rw-r--r--README.md2
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