summaryrefslogtreecommitdiff
path: root/ci/lib.sh
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2019-01-27 15:26:52 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-01-28 10:34:28 -0800
commiteaa62291fff35f3b33780a1572ee6e1a265adb4c (patch)
tree98edf052cae3c1f88ea142adebcd90ef9ba6e898 /ci/lib.sh
parentci/lib.sh: encapsulate Travis-specific things (diff)
downloadtgif-eaa62291fff35f3b33780a1572ee6e1a265adb4c.tar.xz
ci: inherit --jobs via MAKEFLAGS in run-build-and-tests
Let's not decide in the generic ci/ part how many jobs to run in parallel; different CI configurations would favor a different number of parallel jobs, and it is easy enough to hand that information down via the `MAKEFLAGS` variable. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'ci/lib.sh')
-rwxr-xr-xci/lib.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/ci/lib.sh b/ci/lib.sh
index 3f286d86a6..32a28fd209 100755
--- a/ci/lib.sh
+++ b/ci/lib.sh
@@ -101,6 +101,7 @@ then
BREW_INSTALL_PACKAGES="git-lfs gettext"
export GIT_PROVE_OPTS="--timer --jobs 3 --state=failed,slow,save"
export GIT_TEST_OPTS="--verbose-log -x --immediate"
+ export MAKEFLAGS="--jobs=2"
else
echo "Could not identify CI type" >&2
exit 1