diff options
| author |  Andres Erbsen <andres@kevix.co> | 2018-06-26 15:17:39 -0400 |
|---|---|---|
| committer | Andres Erbsen <andres@kevix.co> | 2018-06-27 20:26:04 -0400 |
| commit | 2f2a3eb27c1d76b1943d2b08abb1fc3224109fb3 (patch) | |
| tree | 1b41c5506c788b7e57ae61cf4e954d29dd511c54 | |
| parent | 5481c85cee42eadf14200e3528e6284d96913569 (diff) | |
Add mit-plv/bedrock2-ci to CI
| -rw-r--r-- | .gitlab-ci.yml | 3 | ||||
| -rw-r--r-- | Makefile.ci | 3 | ||||
| -rwxr-xr-x | dev/ci/ci-basic-overlay.sh | 6 | ||||
| -rwxr-xr-x | dev/ci/ci-bedrock2.sh | 11 |
4 files changed, 22 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 971a281ea..4e159ebdc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -306,6 +306,9 @@ validate:edge+flambda: OPAM_SWITCH: edge OPAM_VARIANT: "+flambda" +ci-bedrock2: + <<: *ci-template + ci-bignums: <<: *ci-template diff --git a/Makefile.ci b/Makefile.ci index 7f63157fa..fce16906c 100644 --- a/Makefile.ci +++ b/Makefile.ci @@ -8,7 +8,8 @@ ## # (see LICENSE file for the text of the license) ## ########################################################################## -CI_TARGETS=ci-bignums \ +CI_TARGETS=ci-bedrock2 \ + ci-bignums \ ci-color \ ci-compcert \ ci-coq-dpdgraph \ diff --git a/dev/ci/ci-basic-overlay.sh b/dev/ci/ci-basic-overlay.sh index 2ebbf2cc4..28321d13e 100755 --- a/dev/ci/ci-basic-overlay.sh +++ b/dev/ci/ci-basic-overlay.sh @@ -148,6 +148,12 @@ : "${bignums_CI_GITURL:=https://github.com/coq/bignums}" ######################################################################## +# bedrock2 +######################################################################## +: "${bedrock2_CI_BRANCH:=master}" +: "${bedrock2_CI_GITURL:=https://github.com/mit-plv/bedrock2}" + +######################################################################## # Equations ######################################################################## : "${Equations_CI_BRANCH:=master}" diff --git a/dev/ci/ci-bedrock2.sh b/dev/ci/ci-bedrock2.sh new file mode 100755 index 000000000..447076e09 --- /dev/null +++ b/dev/ci/ci-bedrock2.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +ci_dir="$(dirname "$0")" +. "${ci_dir}/ci-common.sh" + +bedrock2_CI_DIR="${CI_BUILD_DIR}/bedrock2" + +git_checkout "${bedrock2_CI_BRANCH}" "${bedrock2_CI_GITURL}" "${bedrock2_CI_DIR}" +( cd "${bedrock2_CI_DIR}" && git submodule update --init --recursive ) + +( cd "${bedrock2_CI_DIR}" && make ) |