From ae1ce7c19990b0e8c381d7dcbd4bee7a8cd37c45 Mon Sep 17 00:00:00 2001
From: andrewc <andrew@micromelon.com.au>
Date: Tue, 24 Oct 2023 10:23:10 +1000
Subject: [PATCH] Fixup base ci file. Fix bash loop in kibot-ci merge_libs

---
 base-gitlab.yaml | 4 +++-
 kibot-ci.yml     | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

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)