Auto-detect level of parallelism

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 626fd022bad0fbc51f6378d128ef6bfd67564b44..04b70737d0abff290501d42ced20bffdd63b86b1 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,11 +20,7 @@ variables:
    - DEBIAN_FRONTEND=noninteractive apt-get -y install build-essential git cmake libpng-dev libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libleveldb-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev libzstd-dev
   script:
     - git clone https://github.com/minetest/irrlicht -b $IRRLICHT_TAG lib/irrlichtmt
-    - mkdir build
-    - cd build
-    - cmake -DCMAKE_INSTALL_PREFIX=../artifact/minetest/usr/ -DCMAKE_BUILD_TYPE=Release -DRUN_IN_PLACE=FALSE -DENABLE_GETTEXT=TRUE -DBUILD_SERVER=TRUE ..
-    - make -j2
-    - make install
+    - make -j$(($(nproc) + 1))
   artifacts:
     when: on_success
     expire_in: 1h

diff --git a/util/ci/build.sh b/util/ci/build.sh
index 32b5c92a7a3f47d14a49b7c35803ec0413e3ad6d..fb2ec945f54776fe27f41b257bfd1e108c76ccfd 100755 (executable)
--- a/util/ci/build.sh
+++ b/util/ci/build.sh
@@ -5,4 +5,4 @@ cd build
 cmake -DCMAKE_BUILD_TYPE=Debug \
        -DRUN_IN_PLACE=TRUE -DENABLE_GETTEXT=TRUE \
        -DBUILD_SERVER=TRUE ${CMAKE_FLAGS} ..
-make -j2
+make -j$(($(nproc) + 1))

diff --git a/util/ci/build_prometheus_cpp.sh b/util/ci/build_prometheus_cpp.sh
index edfd574cd6d5473b37350ab04e8826437fbd1b53..f3e4a5559ae497eb772d1ada07fee95521c44473 100755 (executable)
--- a/util/ci/build_prometheus_cpp.sh
+++ b/util/ci/build_prometheus_cpp.sh
@@ -8,6 +8,6 @@ cmake .. \
        -DCMAKE_INSTALL_PREFIX=/usr/local \
        -DCMAKE_BUILD_TYPE=Release \
        -DENABLE_TESTING=0
-make -j2
+make -j$(nproc)
 sudo make install