Skip to content

Commit 406f93a

Browse files
szedergitster
authored andcommitted
ci: make sure we build Git parallel
Commit 2c8921d (travis-ci: build with the right compiler, 2019-01-17) started to use MAKEFLAGS to specify which compiler to use to build Git. A bit later, and in a different topic branch commit eaa6229 (ci: inherit --jobs via MAKEFLAGS in run-build-and-tests, 2019-01-27) started to use MAKEFLAGS as well. Unfortunately, there is a semantic conflict between these two commits: both of them set MAKEFLAGS, and since the line adding CC from 2c8921d comes later in 'ci/lib.sh', it overwrites the number of parallel jobs added in eaa6229. Consequently, since both commits have been merged all our CI jobs have been building Git, building its documentation, and applying semantic patches sequentially, making all build jobs a bit slower. Running the test suite is unaffected, because the number of test jobs comes from GIT_PROVE_OPTS. Append to MAKEFLAGS when setting the compiler to use, to ensure that the number of parallel jobs to use is preserved. Signed-off-by: SZEDER Gábor <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent d62dad7 commit 406f93a

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

ci/lib.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,4 +185,4 @@ GIT_TEST_GETTEXT_POISON)
185185
;;
186186
esac
187187

188-
export MAKEFLAGS="CC=${CC:-cc}"
188+
export MAKEFLAGS="$MAKEFLAGS CC=${CC:-cc}"

0 commit comments

Comments
 (0)