From: Junio C Hamano <gitster@pobox.com>
To: "SZEDER Gábor" <szeder.dev@gmail.com>
Cc: git@vger.kernel.org,
"Johannes Schindelin" <johannes.schindelin@gmx.de>,
"Đoàn Trần Công Danh" <congdanhqx@gmail.com>
Subject: Re: [PATCH] ci: make MAKEFLAGS available inside the Docker container in the Linux32 job
Date: Thu, 02 Apr 2020 10:03:03 -0700 [thread overview]
Message-ID: <xmqqftdl4y7s.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <20200401212151.15164-1-szeder.dev@gmail.com> ("SZEDER Gábor"'s message of "Wed, 1 Apr 2020 23:21:51 +0200")
SZEDER Gábor <szeder.dev@gmail.com> writes:
> Once upon a time we ran 'make --jobs=2 ...' to build Git, its
> documentation, or to apply Coccinelle semantic patches. Then commit
> eaa62291ff (ci: inherit --jobs via MAKEFLAGS in run-build-and-tests,
> 2019-01-27) came along, and started using the MAKEFLAGS environment
> variable to centralize setting the number of parallel jobs in
> 'ci/libs.sh'. Alas, it forgot to update 'ci/run-linux32-docker.sh' to
> make MAKEFLAGS available inside the Docker container running the 32
> bit Linux job, and, consequently, since then that job builds Git
> sequentially, and it ignores any Makefile knobs that we might set in
> MAKEFLAGS (though we don't set any for the 32 bit Linux job at the
> moment).
>
> So update the 'docker run' invocation in 'ci/run-linux32-docker.sh' to
> make MAKEFLAGS available inside the Docker container as well. Set
> CC=gcc for the 32 bit Linux job, because that's the compiler installed
> in the 32 bit Linux Docker image that we use (Travis CI nowadays sets
> CC=clang by default, but clang is not installed in this image).
>
> Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
> ---
>
> The 'dd/musl-libc-travis-ci' topic needs some more updates, and those
> will depend on this fix.
Thanks. I'll queue this on top of v2.26.0 so that others can be
rebased on top of it.
next prev parent reply other threads:[~2020-04-02 17:03 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-01 21:21 [PATCH] ci: make MAKEFLAGS available inside the Docker container in the Linux32 job SZEDER Gábor
2020-04-02 17:03 ` Junio C Hamano [this message]
2020-04-02 18:14 ` 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=xmqqftdl4y7s.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=congdanhqx@gmail.com \
--cc=git@vger.kernel.org \
--cc=johannes.schindelin@gmx.de \
--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).