diff options
| author | Enrico Tassi | 2020-11-24 12:25:21 +0100 |
|---|---|---|
| committer | Enrico Tassi | 2020-11-25 15:59:42 +0100 |
| commit | e809ef5a4027c03f4193bcf5d98cad9412d717b3 (patch) | |
| tree | 30cbcb463c7933260ca853e2a23c855deab6aa9a | |
| parent | dc8e605d9cadf0d7ead78481e0e68756713f7aa0 (diff) | |
[docker] don't install ocamlformat
| -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 3c09d0a8c8..6b58676af0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,7 +19,7 @@ stages: variables: # Format: $IMAGE-V$DATE [Cache is not used as of today but kept here # for reference] - CACHEKEY: "bionic_coq-V2020-11-24-V90" + CACHEKEY: "bionic_coq-V2020-11-24-V91" 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 195ac3152e..7942508698 100644 --- a/dev/ci/docker/bionic_coq/Dockerfile +++ b/dev/ci/docker/bionic_coq/Dockerfile @@ -1,4 +1,4 @@ -# CACHEKEY: "bionic_coq-V2020-11-24-V90" +# CACHEKEY: "bionic_coq-V2020-11-24-V91" # ^^ Update when modifying this file. FROM ubuntu:bionic @@ -62,7 +62,7 @@ RUN opam switch create "${COMPILER}+32bit" && eval $(opam env) && \ # EDGE switch ENV COMPILER_EDGE="4.11.1" \ - BASE_OPAM_EDGE="dune.2.5.1 dune-release.1.3.3 ocamlformat.0.15.0" + BASE_OPAM_EDGE="dune.2.5.1 dune-release.1.3.3" # EDGE+flambda switch, we install CI_OPAM as to be able to use # `ci-template-flambda` with everything. |