From cf04e49c5426da3ea684f8e545652803106af0c2 Mon Sep 17 00:00:00 2001 From: Gaƫtan Gilbert Date: Tue, 19 Dec 2017 15:54:34 +0100 Subject: Fix CI with parallel make (messed up dependencies) When invoking through Makefile we always rebuild dependencies. To skip dependencies, invoke ci-wrapper directly. We make Circle CI do this. In order to properly support invoking ci-wrapper directly we replace "make" in ci-common by a bash function which adds -j to the make invocation outside submakes. We also set TIMED in the ci-wrapper. --- dev/ci/ci-hott.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'dev/ci/ci-hott.sh') diff --git a/dev/ci/ci-hott.sh b/dev/ci/ci-hott.sh index 1bf6e9a872..693135a4c9 100755 --- a/dev/ci/ci-hott.sh +++ b/dev/ci/ci-hott.sh @@ -7,4 +7,4 @@ HoTT_CI_DIR=${CI_BUILD_DIR}/HoTT git_checkout ${HoTT_CI_BRANCH} ${HoTT_CI_GITURL} ${HoTT_CI_DIR} -( cd ${HoTT_CI_DIR} && ./autogen.sh && ./configure && make -j ${NJOBS} ) +( cd ${HoTT_CI_DIR} && ./autogen.sh && ./configure && make ) -- cgit v1.2.3