diff options
| author | Gaëtan Gilbert | 2019-11-06 13:21:23 +0100 |
|---|---|---|
| committer | Gaëtan Gilbert | 2019-11-06 13:21:23 +0100 |
| commit | f9b3b05cc05a1ae90e33969cb5c5ded9eb393bd4 (patch) | |
| tree | f758f8108d8500cc64a0b5cb8964ca8f78ba1238 /dev | |
| parent | 634cb7b8a07a34fc29d074591091f0a6170f7bff (diff) | |
| parent | edca3cd0a09129c1772660975a8de18f7c062884 (diff) | |
Merge PR #11051: elpi 1.8
Reviewed-by: SkySkimmer
Reviewed-by: ejgallego
Diffstat (limited to 'dev')
| -rw-r--r-- | dev/ci/docker/bionic_coq/Dockerfile | 4 | ||||
| -rw-r--r-- | dev/ci/user-overlays/10358-gares-elpi13.sh | 6 | ||||
| -rw-r--r-- | dev/ci/user-overlays/10738-gares-elpi1.7.sh | 6 | ||||
| -rw-r--r-- | dev/ci/user-overlays/11051-gares-elpi-1.8.sh | 6 |
4 files changed, 8 insertions, 14 deletions
diff --git a/dev/ci/docker/bionic_coq/Dockerfile b/dev/ci/docker/bionic_coq/Dockerfile index edca83c6ef..1cad46cd89 100644 --- a/dev/ci/docker/bionic_coq/Dockerfile +++ b/dev/ci/docker/bionic_coq/Dockerfile @@ -1,4 +1,4 @@ -# CACHEKEY: "bionic_coq-V2019-09-20-V01" +# CACHEKEY: "bionic_coq-V2019-11-05-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.1 dune.1.11.3 ounit.2.0.8 odoc.1.4.2" \ CI_OPAM="menhir.20190626 ocamlgraph.1.8.8" \ - BASE_ONLY_OPAM="elpi.1.7.0" + BASE_ONLY_OPAM="elpi.1.8.0" # BASE switch; CI_OPAM contains Coq's CI dependencies. ENV COQIDE_OPAM="cairo2.0.6.1 lablgtk3-sourceview3.3.0.beta6" diff --git a/dev/ci/user-overlays/10358-gares-elpi13.sh b/dev/ci/user-overlays/10358-gares-elpi13.sh deleted file mode 100644 index d2ba9b5ddf..0000000000 --- a/dev/ci/user-overlays/10358-gares-elpi13.sh +++ /dev/null @@ -1,6 +0,0 @@ -if [ "$CI_PULL_REQUEST" = "10358" ] || [ "$CI_BRANCH" = "elpi-13-coq" ]; then - - elpi_CI_REF="elpi-13-coq" - 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 deleted file mode 100644 index 8922badf90..0000000000 --- a/dev/ci/user-overlays/10738-gares-elpi1.7.sh +++ /dev/null @@ -1,6 +0,0 @@ -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 diff --git a/dev/ci/user-overlays/11051-gares-elpi-1.8.sh b/dev/ci/user-overlays/11051-gares-elpi-1.8.sh new file mode 100644 index 0000000000..7845654375 --- /dev/null +++ b/dev/ci/user-overlays/11051-gares-elpi-1.8.sh @@ -0,0 +1,6 @@ +if [ "$CI_PULL_REQUEST" = "11051" ] || [ "$CI_BRANCH" = "elpi-1.8" ]; then + + elpi_CI_REF="coq-master+v1.2" + elpi_CI_GITURL=https://github.com/LPCIC/coq-elpi + +fi |