Skip to content

Commit d2fae19

Browse files
szedergitster
authored andcommitted
ci: make MAKEFLAGS available inside the Docker container in the Linux32 job
Once upon a time we ran 'make --jobs=2 ...' to build Git, its documentation, or to apply Coccinelle semantic patches. Then commit eaa6229 (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 <[email protected]> Signed-off-by: Đoàn Trần Công Danh <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 274b9cc commit d2fae19

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

ci/lib.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,9 @@ osx-clang|osx-gcc)
192192
GIT_TEST_GETTEXT_POISON)
193193
export GIT_TEST_GETTEXT_POISON=true
194194
;;
195+
Linux32)
196+
CC=gcc
197+
;;
195198
esac
196199

197200
MAKEFLAGS="$MAKEFLAGS CC=${CC:-cc}"

ci/run-linux32-docker.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ docker run \
2020
--env GIT_PROVE_OPTS \
2121
--env GIT_TEST_OPTS \
2222
--env GIT_TEST_CLONE_2GB \
23+
--env MAKEFLAGS \
2324
--env cache_dir="$container_cache_dir" \
2425
--volume "${PWD}:/usr/src/git" \
2526
--volume "$cache_dir:$container_cache_dir" \

0 commit comments

Comments
 (0)