diff options
| author | Emilio Jesus Gallego Arias | 2019-06-21 23:32:43 +0200 |
|---|---|---|
| committer | Emilio Jesus Gallego Arias | 2019-06-21 23:32:43 +0200 |
| commit | e7ae7950bb50923e005898d18158593754108725 (patch) | |
| tree | 4c44098057b546cd6db42fc6c6d69d63e7e841fd /dev | |
| parent | f70bbc797cc0f4759aa1557211ffa193a3f00a06 (diff) | |
| parent | 3393799f93b6963a83a5c6940d5aeecb827e12ac (diff) | |
Merge PR #10416: Elpi 1.4.0
Reviewed-by: ejgallego
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 |
2 files changed, 8 insertions, 2 deletions
diff --git a/dev/ci/docker/bionic_coq/Dockerfile b/dev/ci/docker/bionic_coq/Dockerfile index 818454dbbc..f07a5cdb98 100644 --- a/dev/ci/docker/bionic_coq/Dockerfile +++ b/dev/ci/docker/bionic_coq/Dockerfile @@ -1,4 +1,4 @@ -# CACHEKEY: "bionic_coq-V2019-06-11-V1" +# CACHEKEY: "bionic_coq-V2019-06-21-V1" # ^^ Update when modifying this file. FROM ubuntu:bionic @@ -38,7 +38,7 @@ ENV COMPILER="4.05.0" # `num` does not have a version number as the right version to install varies # with the compiler version. ENV BASE_OPAM="num ocamlfind.1.8.0 dune.1.6.2 ounit.2.0.8 odoc.1.4.0" \ - CI_OPAM="menhir.20181113 elpi.1.3.1 ocamlgraph.1.8.8" + CI_OPAM="menhir.20181113 elpi.1.4.0 ocamlgraph.1.8.8" # 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 new file mode 100644 index 0000000000..52d1005a7d --- /dev/null +++ b/dev/ci/user-overlays/10416-gares-elpi-14.sh @@ -0,0 +1,6 @@ +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 |