aboutsummaryrefslogtreecommitdiffhomepage
path: root/dev/ci/ci-common.sh
diff options
context:
space:
mode:
authorGravatar Théo Zimmermann <theo.zimmermann@univ-paris-diderot.fr>2017-06-13 18:24:45 +0200
committerGravatar Théo Zimmermann <theo.zimmermann@univ-paris-diderot.fr>2017-06-16 10:35:37 +0200
commitd06af26e6cd93c6bb819b38573603a5e1121ed68 (patch)
treea4d6c02072d0626daa955ba3327e565c8399e1b9 /dev/ci/ci-common.sh
parente1d68573015883301cb401861e10233f6442d9ec (diff)
Each user overlay goes into its own file.
This will avoid stupid merge conflicts in the future.
Diffstat (limited to 'dev/ci/ci-common.sh')
-rw-r--r--dev/ci/ci-common.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/dev/ci/ci-common.sh b/dev/ci/ci-common.sh
index f1e1515d4..5435e9588 100644
--- a/dev/ci/ci-common.sh
+++ b/dev/ci/ci-common.sh
@@ -18,7 +18,9 @@ ls "$COQBIN"
# Where we clone and build external developments
CI_BUILD_DIR=`pwd`/_build_ci
-source ${ci_dir}/ci-user-overlay.sh
+for overlay in ${ci_dir}/user-overlays/*.sh; do
+ source ${overlay}
+done
source ${ci_dir}/ci-basic-overlay.sh
mathcomp_CI_DIR=${CI_BUILD_DIR}/math-comp