diff options
| author | Théo Zimmermann | 2020-04-29 12:26:16 +0200 |
|---|---|---|
| committer | Théo Zimmermann | 2020-04-29 12:26:16 +0200 |
| commit | bc0ef3a5d3c95a43fd3fd76074e237aeb67fccc4 (patch) | |
| tree | 75e5a7e4d51fcb96b4f1aad6bc2b5df4d1c21a67 | |
| parent | 38ab16931dd3f8116bccfbc07b49930485a55bd3 (diff) | |
| parent | 9e7a47b94a333c7c4c19d31642f04b7263db415b (diff) | |
Merge PR #12174: [ci] Add coq-tools to the CI
Reviewed-by: Zimmi48
| -rw-r--r-- | .gitlab-ci.yml | 3 | ||||
| -rw-r--r-- | Makefile.ci | 1 | ||||
| -rwxr-xr-x | dev/ci/ci-basic-overlay.sh | 7 | ||||
| -rwxr-xr-x | dev/ci/ci-coq-tools.sh | 9 |
4 files changed, 20 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1a1d31bdd7..468161ff73 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -676,6 +676,9 @@ library:ci-color: library:ci-compcert: extends: .ci-template-flambda +library:ci-coq-tools: + extends: .ci-template + library:ci-coqprime: stage: stage-3 extends: .ci-template-flambda diff --git a/Makefile.ci b/Makefile.ci index 1a5e8166a2..b545c9de45 100644 --- a/Makefile.ci +++ b/Makefile.ci @@ -20,6 +20,7 @@ CI_TARGETS= \ ci-coquelicot \ ci-corn \ ci-cross-crypto \ + ci-coq-tools \ ci-coqprime \ ci-elpi \ ci-ext-lib \ diff --git a/dev/ci/ci-basic-overlay.sh b/dev/ci/ci-basic-overlay.sh index c18e556da8..88f410ef04 100755 --- a/dev/ci/ci-basic-overlay.sh +++ b/dev/ci/ci-basic-overlay.sh @@ -95,6 +95,13 @@ : "${Flocq_CI_ARCHIVEURL:=${Flocq_CI_GITURL}/-/archive}" ######################################################################## +# coq-tools +######################################################################## +: "${coq_tools_CI_REF:=master}" +: "${coq_tools_CI_GITURL:=https://github.com/JasonGross/coq-tools}" +: "${coq_tools_CI_ARCHIVEURL:=${coq_tools_CI_GITURL}/archive}" + +######################################################################## # Coquelicot ######################################################################## : "${coquelicot_CI_REF:=master}" diff --git a/dev/ci/ci-coq-tools.sh b/dev/ci/ci-coq-tools.sh new file mode 100755 index 0000000000..9c95c49c9f --- /dev/null +++ b/dev/ci/ci-coq-tools.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +ci_dir="$(dirname "$0")" +. "${ci_dir}/ci-common.sh" + +git_download coq_tools + +( cd "${CI_BUILD_DIR}/coq_tools" && make check || \ + { RV=$?; echo "The build broke, if an overlay is needed, mention @JasonGross in describing the expected change in Coq that needs to be taken into account, and he'll prepare a fix for coq-tools"; exit $RV; } ) |