From 8643a7af16ccf9a15c9c28106d6518d444262f44 Mon Sep 17 00:00:00 2001
From: Emilio Jesus Gallego Arias
Date: Tue, 28 Aug 2018 18:39:46 +0200
Subject: [ci] [docker] Update Dune and Elpi versions.

We'd like to use `(lang 1.1)` features. Elpi needs update as recent
`ppx_tools_versioned` changes broke it.
---
 .gitlab-ci.yml                      | 2 +-
 .travis.yml                         | 2 +-
 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" \
-- 
cgit v1.2.3