提交 406f93ae 编写于 作者: S SZEDER Gábor 提交者: Junio C Hamano

ci: make sure we build Git parallel

Commit 2c8921db (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
eaa62291 (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 2c8921db comes later in
'ci/lib.sh', it overwrites the number of parallel jobs added in
eaa62291.

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: NSZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
上级 d62dad7a
......@@ -185,4 +185,4 @@ GIT_TEST_GETTEXT_POISON)
;;
esac
export MAKEFLAGS="CC=${CC:-cc}"
export MAKEFLAGS="$MAKEFLAGS CC=${CC:-cc}"
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册