diff options
| author | Gaëtan Gilbert | 2019-09-17 13:31:02 +0200 |
|---|---|---|
| committer | Gaëtan Gilbert | 2019-09-17 13:31:02 +0200 |
| commit | aa851dc5939af6febe7550b75b066af04905a7ab (patch) | |
| tree | 9f4096618a1d26c2a1a181e1e81704c6c7bde0fc /dev | |
| parent | c18f04422cb0827994e8d7aecc384a2c448a61c9 (diff) | |
| parent | 760a87dfdf3f3f8d6f6d095aaae47902088d9283 (diff) | |
Merge PR #10738: update elpi to 1.7
Reviewed-by: SkySkimmer
Diffstat (limited to 'dev')
| -rw-r--r-- | dev/ci/docker/bionic_coq/Dockerfile | 4 | ||||
| -rw-r--r-- | dev/ci/user-overlays/10416-gares-elpi-14.sh | 6 | ||||
| -rw-r--r-- | dev/ci/user-overlays/10738-gares-elpi1.7.sh | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/dev/ci/docker/bionic_coq/Dockerfile b/dev/ci/docker/bionic_coq/Dockerfile index 7175b5ffd5..567f0539ab 100644 --- a/dev/ci/docker/bionic_coq/Dockerfile +++ b/dev/ci/docker/bionic_coq/Dockerfile @@ -1,4 +1,4 @@ -# CACHEKEY: "bionic_coq-V2019-08-08-V01" +# CACHEKEY: "bionic_coq-V2019-07-09-V01" # ^^ Update when modifying this file. FROM ubuntu:bionic @@ -39,7 +39,7 @@ ENV COMPILER="4.05.0" # with the compiler version. ENV BASE_OPAM="num ocamlfind.1.8.0 dune.1.10.0 ounit.2.0.8 odoc.1.4.0" \ CI_OPAM="menhir.20190626 ocamlgraph.1.8.8" \ - BASE_ONLY_OPAM="elpi.1.4.0" + BASE_ONLY_OPAM="elpi.1.7.0" # BASE switch; CI_OPAM contains Coq's CI dependencies. ENV COQIDE_OPAM="cairo2.0.6 lablgtk3-sourceview3.3.0.beta5" diff --git a/dev/ci/user-overlays/10416-gares-elpi-14.sh b/dev/ci/user-overlays/10416-gares-elpi-14.sh deleted file mode 100644 index 52d1005a7d..0000000000 --- a/dev/ci/user-overlays/10416-gares-elpi-14.sh +++ /dev/null @@ -1,6 +0,0 @@ -if [ "$CI_PULL_REQUEST" = "10416" ] || [ "$CI_BRANCH" = "elpi-14" ]; then - - elpi_CI_REF="coq-master-elpi-14" - elpi_CI_GITURL=https://github.com/LPCIC/coq-elpi - -fi diff --git a/dev/ci/user-overlays/10738-gares-elpi1.7.sh b/dev/ci/user-overlays/10738-gares-elpi1.7.sh new file mode 100644 index 0000000000..8922badf90 --- /dev/null +++ b/dev/ci/user-overlays/10738-gares-elpi1.7.sh @@ -0,0 +1,6 @@ +if [ "$CI_PULL_REQUEST" = "10738" ] || [ "$CI_BRANCH" = "elpi1.7" ]; then + + elpi_CI_REF="coq-master+elpi1.7" + elpi_CI_GITURL=https://github.com/LPCIC/coq-elpi + +fi |