aboutsummaryrefslogtreecommitdiff
path: root/dev/ci/docker
diff options
context:
space:
mode:
authorcoqbot-app[bot]2020-09-15 07:13:36 +0000
committerGitHub2020-09-15 07:13:36 +0000
commit60960284237b295f8b82e07119e1ba1467b9a1de (patch)
tree361ab8cef75bb9e129bdde84e6f3b922047a0fc0 /dev/ci/docker
parent090550218d0a6d08c7df34b1238d5c0d38520bd5 (diff)
parent739c8dc24b93891c64f6d136e30eb0cea3f5c779 (diff)
Merge PR #12972: [ci] [docker] Up testing to OCaml 4.11.1
Reviewed-by: Zimmi48
Diffstat (limited to 'dev/ci/docker')
-rw-r--r--dev/ci/docker/bionic_coq/Dockerfile8
1 files changed, 4 insertions, 4 deletions
diff --git a/dev/ci/docker/bionic_coq/Dockerfile b/dev/ci/docker/bionic_coq/Dockerfile
index 78c8673299..ee50d25318 100644
--- a/dev/ci/docker/bionic_coq/Dockerfile
+++ b/dev/ci/docker/bionic_coq/Dockerfile
@@ -1,4 +1,4 @@
-# CACHEKEY: "bionic_coq-V2020-08-28-V92"
+# CACHEKEY: "bionic_coq-V2020-09-07-V22"
# ^^ Update when modifying this file.
FROM ubuntu:bionic
@@ -43,7 +43,7 @@ ENV COMPILER="4.05.0"
# Common OPAM packages, num to be removed once the migration to
# micromega is complete, `num` also does not have a version number as
# the right version to install varies with the compiler version.
-ENV BASE_OPAM="num zarith.1.9.1 ocamlfind.1.8.1 ounit2.2.2.3 odoc.1.5.0" \
+ENV BASE_OPAM="num zarith.1.9.1 ocamlfind.1.8.1 ounit2.2.2.3 odoc.1.5.1" \
CI_OPAM="menhir.20190626 ocamlgraph.1.8.8" \
BASE_ONLY_OPAM="elpi.1.11.0"
@@ -63,8 +63,8 @@ RUN opam switch create "${COMPILER}+32bit" && eval $(opam env) && \
opam install $BASE_OPAM
# EDGE switch
-ENV COMPILER_EDGE="4.10.0" \
- BASE_OPAM_EDGE="dune.2.5.1 dune-release.1.3.3 ocamlformat.0.14.2"
+ENV COMPILER_EDGE="4.11.1" \
+ BASE_OPAM_EDGE="dune.2.5.1 dune-release.1.3.3 ocamlformat.0.15.0"
# EDGE+flambda switch, we install CI_OPAM as to be able to use
# `ci-template-flambda` with everything.