Junio C Hamano <[email protected]> writes:
> Wouldn't all other hits of "MAKEFLAGS=" in ci/lib.sh also want the
> same treatment, though? We know that "if travis to this, otherwise
> if Asure, do that" is the first block to muck with MAKEFLAGS in the
> script, but a new assignment before that block can be added in the
> future and cause a similar issue unless we do so.
>
> Of course, at some point we do want to say "we do not want to
> inherit it from the outside environment", but then such an
> assignment of empty value should be done at the very beginning with
> a comment, not with "this happens to be the first one to set, so
> let's not append but assign to clear any previous value", I would
> think.
That is, in a patch form on top of yours, something like this.
ci/lib.sh | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/ci/lib.sh b/ci/lib.sh
index cee51a4cc4..288a5b3884 100755
--- a/ci/lib.sh
+++ b/ci/lib.sh
@@ -74,6 +74,9 @@ check_unignored_build_artifacts ()
}
}
+# Clear MAKEFLAGS that may come from the outside world.
+export MAKEFLAGS=
+
# Set 'exit on error' for all CI scripts to let the caller know that
# something went wrong.
# Set tracing executed commands, primarily setting environment variables
@@ -101,7 +104,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"
+ MAKEFLAGS="$MAKEFLAGS --jobs=2"
elif test -n "$SYSTEM_COLLECTIONURI" || test -n "$SYSTEM_TASKDEFINITIONSURI"
then
CI_TYPE=azure-pipelines
@@ -126,7 +129,7 @@ then
BREW_INSTALL_PACKAGES=gcc@8
export GIT_PROVE_OPTS="--timer --jobs 10 --state=failed,slow,save"
export GIT_TEST_OPTS="--verbose-log -x --write-junit-xml"
- export MAKEFLAGS="--jobs=10"
+ MAKEFLAGS="$MAKEFLAGS --jobs=10"
test windows_nt != "$CI_OS_NAME" ||
GIT_TEST_OPTS="--no-chain-lint --no-bin-wrappers $GIT_TEST_OPTS"
else
@@ -185,4 +188,4 @@ GIT_TEST_GETTEXT_POISON)
;;
esac
-export MAKEFLAGS="$MAKEFLAGS CC=${CC:-cc}"
+MAKEFLAGS="$MAKEFLAGS CC=${CC:-cc}"
