diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-02-08 20:44:52 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-02-08 20:44:52 -0800 |
| commit | 19116cd00ef826ca41eab56197b16350c4900c1e (patch) | |
| tree | 04f50fbd2b87f5677c53d6da4dd2604446ba2a5a | |
| parent | Merge branch 'ld/git-p4-remove-flakey-test' (diff) | |
| parent | ci: clear and mark MAKEFLAGS exported just once (diff) | |
| download | tgif-19116cd00ef826ca41eab56197b16350c4900c1e.tar.xz | |
Merge branch 'sg/ci-parallel-build'
Build update.
* sg/ci-parallel-build:
ci: clear and mark MAKEFLAGS exported just once
ci: make sure we build Git parallel
| -rwxr-xr-x | ci/lib.sh | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -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="CC=${CC:-cc}" +MAKEFLAGS="$MAKEFLAGS CC=${CC:-cc}" |