diff options
| author | Emilio Jesus Gallego Arias | 2019-07-06 20:01:19 +0200 |
|---|---|---|
| committer | Emilio Jesus Gallego Arias | 2019-07-06 20:01:19 +0200 |
| commit | ae7fc8bc74289bd8a1eca48c8ca8ecf923888285 (patch) | |
| tree | d2c735be50ef3578db3ef0db99e2f22bd8664cf7 | |
| parent | 766ebac9797616b5abb6663e0ecc656cb11282d4 (diff) | |
| parent | 9236267ee1c4855067ab0fb5b57c0156d4a5de89 (diff) | |
Merge PR #10490: Dockerfile: update menhir version
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | dev/ci/docker/bionic_coq/Dockerfile | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 48e6b37006..f418df3d75 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,7 +10,7 @@ stages: variables: # Format: $IMAGE-V$DATE [Cache is not used as of today but kept here # for reference] - CACHEKEY: "bionic_coq-V2019-06-21-V1" + CACHEKEY: "bionic_coq-V2019-07-05-V33" IMAGE: "$CI_REGISTRY_IMAGE:$CACHEKEY" # By default, jobs run in the base switch; override to select another switch OPAM_SWITCH: "base" diff --git a/dev/ci/docker/bionic_coq/Dockerfile b/dev/ci/docker/bionic_coq/Dockerfile index f07a5cdb98..8b4af9b63f 100644 --- a/dev/ci/docker/bionic_coq/Dockerfile +++ b/dev/ci/docker/bionic_coq/Dockerfile @@ -1,4 +1,4 @@ -# CACHEKEY: "bionic_coq-V2019-06-21-V1" +# CACHEKEY: "bionic_coq-V2019-07-05-V33" # ^^ 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.4.0 ocamlgraph.1.8.8" + CI_OPAM="menhir.20190626 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" |