From: Junio C Hamano <gitster@pobox.com>
To: "SZEDER Gábor" <szeder.dev@gmail.com>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>, git@vger.kernel.org
Subject: Re: [PATCH] ci: make sure we build Git parallel
Date: Thu, 07 Feb 2019 11:35:08 -0800 [thread overview]
Message-ID: <xmqqsgwzo0ib.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <xmqq1s4jpgh6.fsf@gitster-ct.c.googlers.com> (Junio C. Hamano's message of "Thu, 07 Feb 2019 11:04:53 -0800")
Junio C Hamano <gitster@pobox.com> 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}"
next prev parent reply other threads:[~2019-02-07 19:35 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-07 18:37 [PATCH] ci: make sure we build Git parallel SZEDER Gábor
2019-02-07 19:00 ` Junio C Hamano
2019-02-07 19:04 ` Junio C Hamano
2019-02-07 19:35 ` Junio C Hamano [this message]
2019-02-07 22:32 ` Johannes Schindelin
2019-02-07 23:33 ` Junio C Hamano
2019-02-07 23:45 ` [PATCH] ci: clear and mark MAKEFLAGS exported just once Junio C Hamano
2019-02-08 0:17 ` SZEDER Gábor
2019-02-08 10:11 ` Johannes Schindelin
2019-02-08 10:10 ` [PATCH] ci: make sure we build Git parallel Johannes Schindelin
2019-02-08 17:25 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqsgwzo0ib.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=szeder.dev@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).