aboutsummaryrefslogtreecommitdiff
path: root/dev/ci
diff options
context:
space:
mode:
authorGaëtan Gilbert2020-05-21 14:48:39 +0200
committerGaëtan Gilbert2020-05-21 14:48:39 +0200
commitfe15084f6f16f05fda3a1b6f7aa065c850c40264 (patch)
tree69864d8dd63ac35083a13c8b5a9f29a2af059c03 /dev/ci
parent0aedb0c8464d7f84a6fda9ed24290a8341fe8322 (diff)
parent7e8897ae8f47d114451a4edf3246e2223a797bff (diff)
Merge PR #12364: [ci] [docker] Bump ocamlformat and dune
Reviewed-by: SkySkimmer Reviewed-by: vbgl
Diffstat (limited to 'dev/ci')
-rw-r--r--dev/ci/docker/bionic_coq/Dockerfile4
1 files changed, 2 insertions, 2 deletions
diff --git a/dev/ci/docker/bionic_coq/Dockerfile b/dev/ci/docker/bionic_coq/Dockerfile
index 51a602303a..0d2f1dfbc7 100644
--- a/dev/ci/docker/bionic_coq/Dockerfile
+++ b/dev/ci/docker/bionic_coq/Dockerfile
@@ -1,4 +1,4 @@
-# CACHEKEY: "bionic_coq-V2020-05-18-V3"
+# CACHEKEY: "bionic_coq-V2020-05-19-V33"
# ^^ Update when modifying this file.
FROM ubuntu:bionic
@@ -58,7 +58,7 @@ RUN opam switch create "${COMPILER}+32bit" && eval $(opam env) && \
# EDGE switch
ENV COMPILER_EDGE="4.10.0" \
- BASE_OPAM_EDGE="dune.2.5.0 dune-release.1.3.3 ocamlformat.0.14.0"
+ BASE_OPAM_EDGE="dune.2.5.1 dune-release.1.3.3 ocamlformat.0.14.2"
# EDGE+flambda switch, we install CI_OPAM as to be able to use
# `ci-template-flambda` with everything.