aboutsummaryrefslogtreecommitdiffhomepage
path: root/dev
diff options
context:
space:
mode:
authorGravatar Maxime Dénès <mail@maximedenes.fr>2017-05-29 23:26:23 +0200
committerGravatar Maxime Dénès <mail@maximedenes.fr>2017-05-29 23:26:23 +0200
commit0336d4d19d446315cb922149b8ee4e7885843be0 (patch)
tree736e7d580a255d2438a5514ea37b609560bb40a3 /dev
parent42c752cf0336cbadc8e9c092ff5aed6a38899dda (diff)
parent149b0c422027a31972b62457af1bf97bd016e26c (diff)
Merge PR#687: Gitlab CI
Diffstat (limited to 'dev')
-rw-r--r--dev/ci/ci-common.sh13
1 files changed, 10 insertions, 3 deletions
diff --git a/dev/ci/ci-common.sh b/dev/ci/ci-common.sh
index 2711b7eca..f1e1515d4 100644
--- a/dev/ci/ci-common.sh
+++ b/dev/ci/ci-common.sh
@@ -2,11 +2,18 @@
set -xe
+if [ -n "${GITLAB_CI}" ];
+then
+ export COQBIN=`pwd`/install/bin
+else
+ export COQBIN=`pwd`/bin
+fi
+export PATH="$COQBIN:$PATH"
+
# Coq's tools need an ending slash :S, we should fix them.
-export COQBIN=`pwd`/bin/
-export PATH=`pwd`/bin:$PATH
+export COQBIN="$COQBIN/"
-ls `pwd`/bin
+ls "$COQBIN"
# Where we clone and build external developments
CI_BUILD_DIR=`pwd`/_build_ci