diff options
| author | ShadowNinja <shadowninja@minetest.net> | 2021-12-22 22:18:27 -0500 |
|---|---|---|
| committer | rubenwardy <rw@rubenwardy.com> | 2022-04-08 14:55:21 +0100 |
| commit | 35bfffb55624685eb78952304bec112fe5e48691 (patch) | |
| tree | 047a6eb464e892ddb787a0e14fd61171fef300e4 | |
| parent | 8af332c9a782a736d7526b075a3bc652432c2078 (diff) | |
| download | minetest-35bfffb55624685eb78952304bec112fe5e48691.tar.gz minetest-35bfffb55624685eb78952304bec112fe5e48691.tar.bz2 minetest-35bfffb55624685eb78952304bec112fe5e48691.zip | |
Auto-detect level of parallelism
| -rw-r--r-- | .gitlab-ci.yml | 6 | ||||
| -rwxr-xr-x | util/ci/build.sh | 2 | ||||
| -rwxr-xr-x | util/ci/build_prometheus_cpp.sh | 2 |
3 files changed, 3 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 626fd022b..04b70737d 100644 --- 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 32b5c92a7..fb2ec945f 100755 --- 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 edfd574cd..f3e4a5559 100755 --- 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 |