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>
Johannes Schindelin committed
Jan 27, 2019 at 15:26 UTC
eaa62291fff35f3b33780a1572ee6e1a265adb4c
5 files changed
+6
-5
ci/lib.sh
+1
@@ -101,6 +101,7 @@ then
101
BREW_INSTALL_PACKAGES="git-lfs gettext"
102
export GIT_PROVE_OPTS="--timer --jobs 3 --state=failed,slow,save"
103
export GIT_TEST_OPTS="--verbose-log -x --immediate"
104
+ export MAKEFLAGS="--jobs=2"
105
else
106
echo "Could not identify CI type" >&2
107
exit 1
ci/run-build-and-tests.sh
+1
-1
@@ -7,7 +7,7 @@
7
8
ln -s "$cache_dir/.prove" t/.prove
9
10
-make --jobs=2
10
+make
11
make --quiet test
12
if test "$jobname" = "linux-gcc"
13
then
ci/run-linux32-build.sh
+1
-1
@@ -55,6 +55,6 @@ linux32 --32bit i386 su -m -l $CI_USER -c '
55
set -ex
56
cd /usr/src/git
57
test -n "$cache_dir" && ln -s "$cache_dir/.prove" t/.prove
58
- make --jobs=2
58
+ make
59
make --quiet test
60
'
ci/run-static-analysis.sh
+1
-1
@@ -5,7 +5,7 @@
5
6
. ${0%/*}/lib.sh
7
8
-make --jobs=2 coccicheck
8
+make coccicheck
9
10
set +x
11
ci/test-documentation.sh
+2
-2
@@ -12,7 +12,7 @@ make check-builtins
12
make check-docs
13
14
# Build docs with AsciiDoc
15
-make --jobs=2 doc > >(tee stdout.log) 2> >(tee stderr.log >&2)
15
+make doc > >(tee stdout.log) 2> >(tee stderr.log >&2)
16
! test -s stderr.log
17
test -s Documentation/git.html
18
test -s Documentation/git.xml
@@ -24,7 +24,7 @@ check_unignored_build_artifacts
24
25
# Build docs with AsciiDoctor
26
make clean
27
-make --jobs=2 USE_ASCIIDOCTOR=1 doc > >(tee stdout.log) 2> >(tee stderr.log >&2)
27
+make USE_ASCIIDOCTOR=1 doc > >(tee stdout.log) 2> >(tee stderr.log >&2)
28
sed '/^GIT_VERSION = / d' stderr.log
29
! test -s stderr.log
30
test -s Documentation/git.html