From 7cec7d312831f509a2d63e89173395ee428f46fa Mon Sep 17 00:00:00 2001
From: Gaëtan Gilbert
Date: Fri, 30 Mar 2018 17:06:18 +0200
Subject: gitlab: fix environment for build template

When `build` was made to build the doc it dropped `-coqide opt` and
dropped the environment variables for building coqide.

The combination means that when the cache had lablgtk in
opam (installed by some other job) configure would pick it up but the
system package wouldn't be there causing a failure. When lablgtk isn't
in the cache everything was fine.
---
 .gitlab-ci.yml | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 03e001f4a9..f0d7463fc9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -85,10 +85,6 @@ before_script:
     - echo 'end:coq.install'
 
     - set +e
-  variables: &build-variables
-    EXTRA_CONF: "-native-compiler yes -coqide opt"
-    EXTRA_PACKAGES: "$COQIDE_PACKAGES"
-    EXTRA_OPAM: "$COQIDE_OPAM"
 
 .warnings-template: &warnings-template
   # keep warnings in test stage so we can test things even when warnings occur
@@ -151,9 +147,9 @@ before_script:
 build:
   <<: *build-template
   variables:
-    EXTRA_CONF: "-with-doc yes"
-    EXTRA_PACKAGES: "$COQDOC_PACKAGES"
-    EXTRA_OPAM: "$COQDOC_OPAM"
+    EXTRA_CONF: "-native-compiler yes -coqide opt -with-doc yes"
+    EXTRA_PACKAGES: "$COQIDE_PACKAGES $COQDOC_PACKAGES"
+    EXTRA_OPAM: "$COQIDE_OPAM $COQDOC_OPAM"
     PIP_PACKAGES: "$SPHINX_PACKAGES"
 
 # no coqide for 32bit: libgtk installation problems
@@ -167,9 +163,10 @@ build:32bit:
 build:bleeding-edge:
   <<: *build-template
   variables:
-    <<: *build-variables
+    EXTRA_CONF: "-native-compiler yes -coqide opt"
     COMPILER: "$COMPILER_BLEEDING_EDGE"
     CAMLP5_VER: "$CAMLP5_VER_BLEEDING_EDGE"
+    EXTRA_PACKAGES: "$COQIDE_PACKAGES"
     EXTRA_OPAM: "$COQIDE_OPAM_BE"
 
 warnings:
-- 
cgit v1.2.3