summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarel Kočí <cynerd@email.cz>2019-03-06 23:23:07 +0100
committerKarel Kočí <cynerd@email.cz>2019-03-06 23:26:25 +0100
commit6514a738e60f97d49546042df5bfa131ed85ddb2 (patch)
tree49274469f4aa6ac1f5a4e1598cedbac58b88b04e
parent1dfb56380c590d65e8cd313f75cc7cb28841bfc9 (diff)
downloadlaminar-cnf-6514a738e60f97d49546042df5bfa131ed85ddb2.tar.gz
laminar-cnf-6514a738e60f97d49546042df5bfa131ed85ddb2.tar.bz2
laminar-cnf-6514a738e60f97d49546042df5bfa131ed85ddb2.zip
Revert "Change to use only one runner and build 8 jobs in parallel"
This reverts commit f7ac077009bccd9257bc5e4b35631a261c1ece80.
-rw-r--r--files/alpine/abuild.conf2
-rw-r--r--nodes/heavy.conf2
-rw-r--r--scripts/turris-common.sh4
3 files changed, 4 insertions, 4 deletions
diff --git a/files/alpine/abuild.conf b/files/alpine/abuild.conf
index 8842e9d..7846d73 100644
--- a/files/alpine/abuild.conf
+++ b/files/alpine/abuild.conf
@@ -4,7 +4,7 @@ export CXXFLAGS="\$CFLAGS"
export CPPFLAGS="\$CFLAGS"
export LDFLAGS="-Wl,--as-needed"
-export JOBS=8
+export JOBS=4
export MAKEFLAGS=-j\$JOBS
USE_COLORS=1
diff --git a/nodes/heavy.conf b/nodes/heavy.conf
index d53e4ac..db1bd7e 100644
--- a/nodes/heavy.conf
+++ b/nodes/heavy.conf
@@ -1,2 +1,2 @@
-EXECUTORS=1
+EXECUTORS=2
TAGS=heavy
diff --git a/scripts/turris-common.sh b/scripts/turris-common.sh
index 8a4e4e6..fafcc82 100644
--- a/scripts/turris-common.sh
+++ b/scripts/turris-common.sh
@@ -1,5 +1,5 @@
-parallel=-j8
-make="make -j8 IS_TTY=1 BUILD_LOG=1"
+parallel=-j4
+make="make -j4 IS_TTY=1 BUILD_LOG=1"
if [ "$V" -ge 1 ]; then
parallel=-j1
make="make -j1 IS_TTY=1 BUILD_LOG=1 V=99"