diff options
| author | Gaëtan Gilbert | 2018-08-31 15:42:17 +0200 |
|---|---|---|
| committer | Gaëtan Gilbert | 2018-08-31 15:42:17 +0200 |
| commit | 066f39a306e7b3409355274b4b266ceda8de15ee (patch) | |
| tree | 3410188e05bf32fa4270e81b80fb8d93adae0515 | |
| parent | 6007c4df90d8e533ed0518c87d2f3afff9a6eb09 (diff) | |
| parent | 8643a7af16ccf9a15c9c28106d6518d444262f44 (diff) | |
Merge PR #8351: [ci] [docker] Update base Dune version.
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | dev/ci/docker/bionic_coq/Dockerfile | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 492b658d98..f42d13e4c1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,7 +9,7 @@ stages: variables: # Format: $IMAGE-V$DATE [Cache is not used as of today but kept here # for reference] - CACHEKEY: "bionic_coq-V2018-07-11-V2" + CACHEKEY: "bionic_coq-V2018-08-27-V2" IMAGE: "$CI_REGISTRY_IMAGE:$CACHEKEY" # By default, jobs run in the base switch; override to select another switch OPAM_SWITCH: "base" diff --git a/.travis.yml b/.travis.yml index f8b047ea18..dd28410bec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,7 +40,7 @@ env: # system is == 4.02.3 - COMPILER="system" - COMPILER_BE="4.07.0" - - DUNE_VER=".1.0.0" + - DUNE_VER=".1.1.1" - CAMLP5_VER=".6.14" - CAMLP5_VER_BE=".7.06" - FINDLIB_VER=".1.4.1" diff --git a/dev/ci/docker/bionic_coq/Dockerfile b/dev/ci/docker/bionic_coq/Dockerfile index 1361392dc8..7a649591dd 100644 --- a/dev/ci/docker/bionic_coq/Dockerfile +++ b/dev/ci/docker/bionic_coq/Dockerfile @@ -1,4 +1,4 @@ -# CACHEKEY: "bionic_coq-V2018-07-11-V2" +# CACHEKEY: "bionic_coq-V2018-08-27-V2" # ^^ Update when modifying this file. FROM ubuntu:bionic @@ -28,8 +28,8 @@ RUN opam init -a -y -j $NJOBS --compiler="$COMPILER" default https://opam.ocaml. # 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.0 dune.1.0.0 ounit.2.0.8" \ - CI_OPAM="menhir.20180530 elpi.1.0.4 ocamlgraph.1.8.8" +ENV BASE_OPAM="num ocamlfind.1.8.0 dune.1.1.1 ounit.2.0.8" \ + CI_OPAM="menhir.20180530 elpi.1.0.5 ocamlgraph.1.8.8" # BASE switch; CI_OPAM contains Coq's CI dependencies. ENV CAMLP5_VER="6.14" \ |