diff options
| author | Gaëtan Gilbert | 2018-09-03 14:32:00 +0200 |
|---|---|---|
| committer | Gaëtan Gilbert | 2018-09-03 14:32:00 +0200 |
| commit | bb5c4eee0807cd988d236d4538a2fa2f05ef0daf (patch) | |
| tree | 92fe203e3afda29fde0c439538f607d1caed4019 /dev/ci/ci-common.sh | |
| parent | 937d2a0ea78bbbdf392d0a128f177f413db34c77 (diff) | |
| parent | 42b84104e9a3278c024a9d70e0cb32e3d277a8ae (diff) | |
Merge PR #8376: Source basic overlay after user overlays to fix #8375 following #8348.
Diffstat (limited to 'dev/ci/ci-common.sh')
| -rw-r--r-- | dev/ci/ci-common.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dev/ci/ci-common.sh b/dev/ci/ci-common.sh index 3536cc70b2..7af648f0a6 100644 --- a/dev/ci/ci-common.sh +++ b/dev/ci/ci-common.sh @@ -37,12 +37,12 @@ ls "$COQBIN" # Where we download and build external developments CI_BUILD_DIR="$PWD/_build_ci" -# shellcheck source=ci-basic-overlay.sh -. "${ci_dir}/ci-basic-overlay.sh" for overlay in "${ci_dir}"/user-overlays/*.sh; do # shellcheck source=/dev/null . "${overlay}" done +# shellcheck source=ci-basic-overlay.sh +. "${ci_dir}/ci-basic-overlay.sh" # [git_download project] will download [project] and unpack it # in [$CI_BUILD_DIR/project] if the folder does not exist already; |