diff options
| author | Théo Zimmermann | 2020-04-13 13:19:24 +0200 |
|---|---|---|
| committer | Théo Zimmermann | 2020-04-13 13:19:24 +0200 |
| commit | 1a309cd7d8547d9a2b5ee89adfe8ba1c581237e1 (patch) | |
| tree | cdf73dfa34c341c0b98b7a41c57d12d7837df127 /dev/ci | |
| parent | 227520b14e978e19d58368de873521a283aecedd (diff) | |
| parent | 29aa2b5533a36e170fb0ed947f86e70d5b1cb8fb (diff) | |
Merge PR #11539: [dune] [stdlib] Build the standard library natively with Dune.
Reviewed-by: Zimmi48
Diffstat (limited to 'dev/ci')
| -rw-r--r-- | dev/ci/docker/bionic_coq/Dockerfile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/dev/ci/docker/bionic_coq/Dockerfile b/dev/ci/docker/bionic_coq/Dockerfile index 0c8733c75a..58677b8496 100644 --- a/dev/ci/docker/bionic_coq/Dockerfile +++ b/dev/ci/docker/bionic_coq/Dockerfile @@ -1,4 +1,4 @@ -# CACHEKEY: "bionic_coq-V2020-03-27-V12" +# CACHEKEY: "bionic_coq-V2020-03-11-V28" # ^^ Update when modifying this file. FROM ubuntu:bionic @@ -37,7 +37,7 @@ ENV COMPILER="4.05.0" # Common OPAM packages. # `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.1 dune.2.0.1 ounit.2.2.2 odoc.1.5.0" \ +ENV BASE_OPAM="num ocamlfind.1.8.1 ounit.2.2.2 odoc.1.5.0" \ CI_OPAM="menhir.20190626 ocamlgraph.1.8.8" \ BASE_ONLY_OPAM="elpi.1.10.2" @@ -57,7 +57,7 @@ RUN opam switch create "${COMPILER}+32bit" && eval $(opam env) && \ # EDGE switch ENV COMPILER_EDGE="4.10.0" \ - BASE_OPAM_EDGE="dune-release.1.3.3 ocamlformat.0.13.0" + BASE_OPAM_EDGE="dune.2.5.0 dune-release.1.3.3 ocamlformat.0.13.0" # EDGE+flambda switch, we install CI_OPAM as to be able to use # `ci-template-flambda` with everything. |