diff options
Diffstat (limited to 'util/ci')
| -rwxr-xr-x | util/ci/build.sh | 10 | ||||
| -rw-r--r-- | util/ci/common.sh | 4 |
2 files changed, 10 insertions, 4 deletions
diff --git a/util/ci/build.sh b/util/ci/build.sh index 435cc11da..88349b852 100755 --- a/util/ci/build.sh +++ b/util/ci/build.sh @@ -1,6 +1,10 @@ #! /bin/bash -e -cmake -B build -DCMAKE_BUILD_TYPE=Debug \ - -DRUN_IN_PLACE=TRUE -DENABLE_GETTEXT=TRUE \ - -DBUILD_SERVER=TRUE ${CMAKE_FLAGS} +cmake -B build \ + -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE:-Debug} \ + -DRUN_IN_PLACE=TRUE \ + -DENABLE_GETTEXT=${CMAKE_ENABLE_GETTEXT:-TRUE} \ + -DBUILD_SERVER=${CMAKE_BUILD_SERVER:-TRUE} \ + ${CMAKE_FLAGS} + cmake --build build --parallel $(($(nproc) + 1)) diff --git a/util/ci/common.sh b/util/ci/common.sh index e372dc682..82529c712 100644 --- a/util/ci/common.sh +++ b/util/ci/common.sh @@ -7,7 +7,9 @@ install_linux_deps() { libhiredis-dev libogg-dev libgmp-dev libvorbis-dev libopenal-dev \ gettext libpq-dev libleveldb-dev libcurl4-openssl-dev libzstd-dev) - if [[ "$1" == "--old-irr" ]]; then + if [[ "$1" == "--no-irr" ]]; then + shift + elif [[ "$1" == "--old-irr" ]]; then shift pkgs+=(libirrlicht-dev) else |