diff options
| author | Théo Zimmermann | 2019-12-13 21:10:34 +0100 |
|---|---|---|
| committer | Théo Zimmermann | 2019-12-13 21:10:34 +0100 |
| commit | bd2b6097e731cad6654cd2948d1483a39fb37b84 (patch) | |
| tree | 2b97bbe676b40ef00bf450f65ec16c6dade04909 /dev/ci/docker | |
| parent | 15c289153e09d4202315319f95f0b284ca8d0fee (diff) | |
| parent | eb00b4aa84d32f987a44538028a749386050210b (diff) | |
Merge PR #11257: [dev] [ocaml] Add ocamlformat configuration.
Reviewed-by: Zimmi48
Diffstat (limited to 'dev/ci/docker')
| -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 8907843b12..b8f9d99702 100644 --- a/dev/ci/docker/bionic_coq/Dockerfile +++ b/dev/ci/docker/bionic_coq/Dockerfile @@ -1,4 +1,4 @@ -# CACHEKEY: "bionic_coq-V2019-12-03-V81" +# CACHEKEY: "bionic_coq-V2019-12-08-V82" # ^^ Update when modifying this file. FROM ubuntu:bionic @@ -22,7 +22,7 @@ RUN pip3 install sphinx==1.7.8 sphinx_rtd_theme==0.2.5b2 \ antlr4-python3-runtime==4.7.1 sphinxcontrib-bibtex==0.4.0 # We need to install OPAM 2.0 manually for now. -RUN wget https://github.com/ocaml/opam/releases/download/2.0.4/opam-2.0.4-x86_64-linux -O /usr/bin/opam && chmod 755 /usr/bin/opam +RUN wget https://github.com/ocaml/opam/releases/download/2.0.5/opam-2.0.5-x86_64-linux -O /usr/bin/opam && chmod 755 /usr/bin/opam # Basic OPAM setup ENV NJOBS="2" \ @@ -58,7 +58,7 @@ RUN opam switch create "${COMPILER}+32bit" && eval $(opam env) && \ # EDGE switch ENV COMPILER_EDGE="4.09.0" \ COQIDE_OPAM_EDGE="cairo2.0.6.1 lablgtk3-sourceview3.3.0.beta6" \ - BASE_OPAM_EDGE="dune-release.1.3.3" + BASE_OPAM_EDGE="dune-release.1.3.3 ocamlformat.0.12" # EDGE+flambda switch, we install CI_OPAM as to be able to use # `ci-template-flambda` with everything. |