diff --git a/base-gitlab.yaml b/base-gitlab.yaml index fb7c9d7..864e2c9 100644 --- a/base-gitlab.yaml +++ b/base-gitlab.yaml @@ -1 +1,3 @@ -include ".gitlab/kibot-ci.yaml" +include: + - project: 'Micromelon/education/hardware/kicad-ci' + file: '/kibot-ci.yml' diff --git a/kibot-ci.yml b/kibot-ci.yml index 3415dc4..06d8379 100644 --- a/kibot-ci.yml +++ b/kibot-ci.yml @@ -109,7 +109,7 @@ image: merge_libs: - | if [[ $GITLAB_CI == 'true' && $CI_COMMIT_BRANCH == "main" ]]; then - for d in ["libs/melonlib", "libs/melon3d"] + for d in "libs/melonlib" "libs/melon3d" do cd $d CURR_B=$(git rev-parse --abbrev-ref HEAD)