From cde263581c49a75f8abdbcb398511942906e6204 Mon Sep 17 00:00:00 2001
From: Emilio Jesus Gallego Arias
Date: Sat, 5 May 2018 19:23:49 +0200
Subject: [gitlab] Add bleeding-edge flambda build.

We also introduce a bit more systematic job naming: `base/edge`.

In order to make the flambda switch selectable we update the Docker
image so all the dependencies are installed in that one.

Note the extra quote rule for the flambda parameters, but unless we
can assign arrays to Gitlab variables there is not a good way to do
this I'm afraid.

With this patch we are getting close to being able to remove most
builds from Travis.
---
 dev/ci/docker/bionic_coq/Dockerfile      | 2 +-
 dev/ci/docker/bionic_coq/hooks/post_push | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'dev/ci/docker')

diff --git a/dev/ci/docker/bionic_coq/Dockerfile b/dev/ci/docker/bionic_coq/Dockerfile
index 9201001574..689d203a16 100644
--- a/dev/ci/docker/bionic_coq/Dockerfile
+++ b/dev/ci/docker/bionic_coq/Dockerfile
@@ -43,4 +43,4 @@ RUN opam switch -y -j $NJOBS $COMPILER_BE && eval $(opam config env) && \
 
 # BE+flambda switch
 RUN opam switch -y -j $NJOBS "${COMPILER_BE}+flambda" && eval $(opam config env) && \
-    opam install -j $NJOBS $BASE_OPAM camlp5.$CAMLP5_VER_BE $COQIDE_OPAM_BE
+    opam install -j $NJOBS $BASE_OPAM camlp5.$CAMLP5_VER_BE $COQIDE_OPAM_BE $CI_OPAM
diff --git a/dev/ci/docker/bionic_coq/hooks/post_push b/dev/ci/docker/bionic_coq/hooks/post_push
index 6daf337a72..307680aa51 100755
--- a/dev/ci/docker/bionic_coq/hooks/post_push
+++ b/dev/ci/docker/bionic_coq/hooks/post_push
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-COQCI_VERSION=V2018-05-07
+COQCI_VERSION=V2018-05-07-V2
 docker tag $IMAGE_NAME $DOCKER_REPO:$COQCI_VERSION
 docker push $DOCKER_REPO:$COQCI_VERSION
 
-- 
cgit v1.2.3