In a8c51f77d16 (ci: clear and mark MAKEFLAGS exported just once,
2019-02-07) the assignment of MAKEFLAGS was done up-front to
future-proof this code for the bug fixed in 406f93ae488 (ci: make sure
we build Git parallel, 2019-02-07).
But since 4a6e4b96026 (CI: remove Travis CI support, 2021-11-23) the
--jobs=10 has been an invariant here, so let's assign --jobs=$NPROC to
the MAKEFLAGS right away, this gets rid of the leading whitespace from
the $MAKEFLAGS variable, as it would previously be empty on the first
assignment.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx>
---
ci/lib.sh | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/ci/lib.sh b/ci/lib.sh
index a6cdcfa014b..edf26984aeb 100755
--- a/ci/lib.sh
+++ b/ci/lib.sh
@@ -26,17 +26,19 @@ check_unignored_build_artifacts ()
# GitHub Action doesn't set TERM, which is required by tput
export TERM=${TERM:-dumb}
+# How many jobs to run in parallel?
+NPROC=10
+
# Clear MAKEFLAGS that may come from the outside world.
-export MAKEFLAGS=
+export MAKEFLAGS=--jobs=$NPROC
if test "$GITHUB_ACTIONS" = "true"
then
CI_TYPE=github-actions
CC="${CC:-gcc}"
- export GIT_PROVE_OPTS="--timer --jobs 10"
+ export GIT_PROVE_OPTS="--timer --jobs $NPROC"
export GIT_TEST_OPTS="--verbose-log -x"
- MAKEFLAGS="$MAKEFLAGS --jobs=10"
test Windows != "$RUNNER_OS" ||
GIT_TEST_OPTS="--no-chain-lint --no-bin-wrappers $GIT_TEST_OPTS"
else
--
2.36.0.879.g3659959fcca
