diff options
| author | Gaëtan Gilbert | 2017-12-19 15:54:34 +0100 |
|---|---|---|
| committer | Gaëtan Gilbert | 2017-12-21 00:07:34 +0100 |
| commit | cf04e49c5426da3ea684f8e545652803106af0c2 (patch) | |
| tree | 394baab9d1aff785f2eef7b75f9297a07c286a7c /dev/ci/ci-wrapper.sh | |
| parent | f431dac2e219cb2a76b22e452d6e407869d89f42 (diff) | |
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.
Diffstat (limited to 'dev/ci/ci-wrapper.sh')
| -rwxr-xr-x | dev/ci/ci-wrapper.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dev/ci/ci-wrapper.sh b/dev/ci/ci-wrapper.sh index a21bf9f38c..12a70176c2 100755 --- a/dev/ci/ci-wrapper.sh +++ b/dev/ci/ci-wrapper.sh @@ -15,13 +15,13 @@ function travis_fold { CI_NAME="$1" CI_SCRIPT="ci-${CI_NAME}.sh" + DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" # assume this script is in dev/ci/, cd to the root Coq directory cd "${DIR}/../.." +export TIMED=1 "${DIR}/${CI_SCRIPT}" 2>&1 | tee time-of-build.log travis_fold 'start' 'coq.test.timing' && echo 'Aggregating timing log...' python ./tools/make-one-time-file.py time-of-build.log travis_fold 'end' 'coq.test.timing' - -touch "_build_ci/.ci-${CI_NAME}.done" |