aboutsummaryrefslogtreecommitdiff
path: root/dev/ci/ci-common.sh
diff options
context:
space:
mode:
authorGaëtan Gilbert2020-12-16 10:22:56 +0100
committerGaëtan Gilbert2020-12-16 10:25:55 +0100
commitfaafe8bfb97e7b05afbcc903cc946d9fca038df5 (patch)
tree34ffdd5643de382ebc2f597abff09ff7732c20d7 /dev/ci/ci-common.sh
parent46c55ced3d1a78f63b3b50fc12d9760663e87e57 (diff)
Fix overlay system: projects need to be loaded before overlays.
Also fixes is_in_projects
Diffstat (limited to 'dev/ci/ci-common.sh')
-rw-r--r--dev/ci/ci-common.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/dev/ci/ci-common.sh b/dev/ci/ci-common.sh
index fdba690155..8d8f78e10c 100644
--- a/dev/ci/ci-common.sh
+++ b/dev/ci/ci-common.sh
@@ -73,14 +73,14 @@ function overlay()
}
set +x
+# 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
# the directoy can be empty
if [ -e "${overlay}" ]; then . "${overlay}"; fi
done
-
-# shellcheck source=ci-basic-overlay.sh
-. "${ci_dir}/ci-basic-overlay.sh"
set -x
# [git_download project] will download [project] and unpack it