diff options
| author |  Gaëtan Gilbert <gaetan.gilbert@skyskimmer.net> | 2017-12-19 15:54:34 +0100 |
|---|---|---|
| committer | Gaëtan Gilbert <gaetan.gilbert@skyskimmer.net> | 2017-12-21 00:07:34 +0100 |
| commit | cf04e49c5426da3ea684f8e545652803106af0c2 (patch) | |
| tree | 394baab9d1aff785f2eef7b75f9297a07c286a7c /.circleci | |
| 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 '.circleci')
| -rw-r--r-- | .circleci/config.yml | 90 |
1 files changed, 45 insertions, 45 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 7c250c667..c49bc3b08 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -166,7 +166,7 @@ opam-switch: &opam-switch name: Test command: | source ~/.profile - make -f Makefile.ci -j ${NJOBS} TIMED=1 ${CIRCLE_JOB} + dev/ci/ci-wrapper.sh ${CIRCLE_JOB} - persist_to_workspace: root: *workspace paths: @@ -255,85 +255,85 @@ jobs: COMPILER: *compiler-be EXTRA_PACKAGES: *timing-packages - ci-bignums: + bignums: <<: *ci-template - ci-color: + color: <<: *ci-template environment: <<: *ci-template-vars EXTRA_PACKAGES: *timing-packages - ci-compcert: + compcert: <<: *ci-template - ci-coq-dpdgraph: + coq-dpdgraph: <<: *ci-template environment: <<: *ci-template-vars EXTRA_PACKAGES: "time python autoconf automake" - ci-coquelicot: + coquelicot: <<: *ci-template environment: <<: *ci-template-vars EXTRA_PACKAGES: "time python autoconf automake" - ci-equations: + equations: <<: *ci-template - ci-geocoq: + geocoq: <<: *ci-template - ci-fiat-crypto: + fiat-crypto: <<: *ci-template - ci-fiat-parsers: + fiat-parsers: <<: *ci-template environment: <<: *ci-template-vars EXTRA_PACKAGES: *timing-packages - ci-flocq: + flocq: <<: *ci-template environment: <<: *ci-template-vars EXTRA_PACKAGES: "time python autoconf automake" - ci-math-classes: + math-classes: <<: *ci-template - ci-corn: + corn: <<: *ci-template - ci-formal-topology: + formal-topology: <<: *ci-template - ci-hott: + hott: <<: *ci-template environment: <<: *ci-template-vars EXTRA_PACKAGES: "time python autoconf automake" - ci-iris-lambda-rust: + iris-lambda-rust: <<: *ci-template - ci-ltac2: + ltac2: <<: *ci-template - ci-math-comp: + math-comp: <<: *ci-template - ci-sf: + sf: <<: *ci-template environment: <<: *ci-template-vars EXTRA_PACKAGES: "time python wget" - ci-unimath: + unimath: <<: *ci-template - ci-vst: + vst: <<: *ci-template workflows: @@ -354,38 +354,38 @@ workflows: - test-suite: *req-main - documentation: *req-main - - ci-bignums: *req-main - - ci-color: + - bignums: *req-main + - color: requires: - build - - ci-bignums - - ci-compcert: *req-main - - ci-coq-dpdgraph: *req-main - - ci-coquelicot: *req-main - - ci-equations: *req-main - - ci-geocoq: *req-main - - ci-fiat-crypto: *req-main - - ci-fiat-parsers: *req-main - - ci-flocq: *req-main - - ci-math-classes: + - bignums + - compcert: *req-main + - coq-dpdgraph: *req-main + - coquelicot: *req-main + - equations: *req-main + - geocoq: *req-main + - fiat-crypto: *req-main + - fiat-parsers: *req-main + - flocq: *req-main + - math-classes: requires: - build - - ci-bignums - - ci-corn: + - bignums + - corn: requires: - build - - ci-math-classes - - ci-formal-topology: + - math-classes + - formal-topology: requires: - build - - ci-corn - - ci-hott: *req-main - - ci-iris-lambda-rust: *req-main - - ci-ltac2: *req-main - - ci-math-comp: *req-main - - ci-sf: *req-main - - ci-unimath: *req-main - - ci-vst: *req-main + - corn + - hott: *req-main + - iris-lambda-rust: *req-main + - ltac2: *req-main + - math-comp: *req-main + - sf: *req-main + - unimath: *req-main + - vst: *req-main - build-32bit: requires: |