aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2021-03-07 00:41:17 +0100
committerEven Rouault <even.rouault@spatialys.com>2021-03-07 00:41:17 +0100
commit23ef6450fa6ba088ee82a1f3a82680cc998ba4c3 (patch)
tree68967f7796e060ab0ef5de43aa2d6cee1b00a3c2
parent3af34fc1c404ab05499134fb36288c883ae1c1c9 (diff)
downloadPROJ-23ef6450fa6ba088ee82a1f3a82680cc998ba4c3.tar.gz
PROJ-23ef6450fa6ba088ee82a1f3a82680cc998ba4c3.zip
Travis ARM64: set NPROC=4 to avoid the autodetected 32 to blow out RAM
-rw-r--r--.travis.yml1
-rwxr-xr-xtravis/install.sh14
2 files changed, 9 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml
index bf53a57c..06b45a8c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,6 +38,7 @@ matrix:
env:
- BUILD_NAME=linux_generic
- DETAILS="linux, arm64"
+ - NPROC=4
allow_failures:
- env: BUILD_NAME=mingw32
diff --git a/travis/install.sh b/travis/install.sh
index a39323eb..ea271d92 100755
--- a/travis/install.sh
+++ b/travis/install.sh
@@ -3,13 +3,15 @@
set -e
UNAME="$(uname)" || UNAME=""
-if test "${UNAME}" = "Linux" ; then
- NPROC=$(nproc);
-elif test "${UNAME}" = "Darwin" ; then
- NPROC=$(sysctl -n hw.ncpu);
-fi
if test "x${NPROC}" = "x"; then
- NPROC=2;
+ if test "${UNAME}" = "Linux" ; then
+ NPROC=$(nproc);
+ elif test "${UNAME}" = "Darwin" ; then
+ NPROC=$(sysctl -n hw.ncpu);
+ fi
+ if test "x${NPROC}" = "x"; then
+ NPROC=2;
+ fi
fi
echo "NPROC=${NPROC}"
export MAKEFLAGS="-j ${NPROC}"