git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] ci: make MAKEFLAGS available inside the Docker container in the Linux32 job

From
Junio C Hamano <gitster@pobox.com>
Date
Apr 2, 2020, 18:14 UTC
Message-ID
<xmqqk12x3gc3.fsf@gitster.c.googlers.com>
In-Reply-To
<xmqqftdl4y7s.fsf@gitster.c.googlers.com>
Junio C Hamano <gitster@pobox.com> writes:
Show 28 quoted lines
> 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.

Actually, the updated dd/ci-musl-libc has this at the bottom of the series, so I won't have a separate topic for this patch.

Thanks anyway.
Previous: Junio C Hamano
Message 3 of 3 in “ci: make MAKEFLAGS available inside the Docker container in the Linux32 job”
  1. ci: make MAKEFLAGS available inside the Docker container in the Linux32 jobSZEDER Gábor, Apr 1, 2020
  2. Junio C HamanoApr 2, 2020
  3. Junio C HamanoApr 2, 2020

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.