From 88d02915a4a6982a5bc4e3fd2fcaf2a805615042 Mon Sep 17 00:00:00 2001
From: andrewc <andrew@micromelon.com.au>
Date: Tue, 24 Jun 2025 09:40:00 +1000
Subject: [PATCH] Moved kibot configs around to maybe fix pipeline

---
 blank.kibot.yaml => configs/blank.kibot.yaml       | 0
 default.kibot.yaml => configs/default.kibot.yaml   | 2 +-
 mech.kibot.yaml => configs/mech.kibot.yaml         | 0
 panel.kibot.yaml => configs/panel.kibot.yaml       | 0
 pcb_dev.kibot.yaml => configs/pcb_dev.kibot.yaml   | 0
 pcb_main.kibot.yaml => configs/pcb_main.kibot.yaml | 0
 pos.kibot.yaml => configs/pos.kibot.yaml           | 0
 sch.kibot.yaml => configs/sch.kibot.yaml           | 0
 kibot-ci.yml                                       | 6 +++---
 9 files changed, 4 insertions(+), 4 deletions(-)
 rename blank.kibot.yaml => configs/blank.kibot.yaml (100%)
 rename default.kibot.yaml => configs/default.kibot.yaml (99%)
 rename mech.kibot.yaml => configs/mech.kibot.yaml (100%)
 rename panel.kibot.yaml => configs/panel.kibot.yaml (100%)
 rename pcb_dev.kibot.yaml => configs/pcb_dev.kibot.yaml (100%)
 rename pcb_main.kibot.yaml => configs/pcb_main.kibot.yaml (100%)
 rename pos.kibot.yaml => configs/pos.kibot.yaml (100%)
 rename sch.kibot.yaml => configs/sch.kibot.yaml (100%)

diff --git a/blank.kibot.yaml b/configs/blank.kibot.yaml
similarity index 100%
rename from blank.kibot.yaml
rename to configs/blank.kibot.yaml
diff --git a/default.kibot.yaml b/configs/default.kibot.yaml
similarity index 99%
rename from default.kibot.yaml
rename to configs/default.kibot.yaml
index cc7a800..6ef36bd 100644
--- a/default.kibot.yaml
+++ b/configs/default.kibot.yaml
@@ -3,7 +3,7 @@ kibot:
   version: 1
 
 import:
-  - file: '../kibot.yaml' 
+  - file: 'user.kibot.yaml' 
 
 preflight:
   # erc: true
diff --git a/mech.kibot.yaml b/configs/mech.kibot.yaml
similarity index 100%
rename from mech.kibot.yaml
rename to configs/mech.kibot.yaml
diff --git a/panel.kibot.yaml b/configs/panel.kibot.yaml
similarity index 100%
rename from panel.kibot.yaml
rename to configs/panel.kibot.yaml
diff --git a/pcb_dev.kibot.yaml b/configs/pcb_dev.kibot.yaml
similarity index 100%
rename from pcb_dev.kibot.yaml
rename to configs/pcb_dev.kibot.yaml
diff --git a/pcb_main.kibot.yaml b/configs/pcb_main.kibot.yaml
similarity index 100%
rename from pcb_main.kibot.yaml
rename to configs/pcb_main.kibot.yaml
diff --git a/pos.kibot.yaml b/configs/pos.kibot.yaml
similarity index 100%
rename from pos.kibot.yaml
rename to configs/pos.kibot.yaml
diff --git a/sch.kibot.yaml b/configs/sch.kibot.yaml
similarity index 100%
rename from sch.kibot.yaml
rename to configs/sch.kibot.yaml
diff --git a/kibot-ci.yml b/kibot-ci.yml
index eeed13a..4349384 100644
--- a/kibot-ci.yml
+++ b/kibot-ci.yml
@@ -82,15 +82,15 @@ image:
           fi
           echo ${dir_arr[i-1]} 
           echo ${sch_arr[i-1]} 
-          USER_FILE="$CI_PROJECT_DIR/.gitlab/blank.kibot.yaml"
+          USER_FILE="$CI_PROJECT_DIR/.gitlab/configs/blank.kibot.yaml"
           if [ -f "${dir_arr[i-1]}/kibot.yaml" ]; then
               USER_FILE="${dir_arr[i-1]}/kibot.yaml"
           fi
-          cp $USER_FILE $CI_PROJECT_DIR/kibot.yaml
+          cp $USER_FILE $CI_PROJECT_DIR/.gitlab/configs/user.kibot.yaml
           python3 $CI_PROJECT_DIR/.gitlab/.scripts/orig.py ${dir_arr[i-1]}
           for CONF in $KIBOT_CONF
           do
-            kibot -e ${dir_arr[i-1]}/${sch_arr[i-1]} -c $CI_PROJECT_DIR/.gitlab/$CONF.kibot.yaml -d $CI_PROJECT_DIR/Fabrication/${dir_arr[i-1]} $VARIANTS $CONF
+            kibot -e ${dir_arr[i-1]}/${sch_arr[i-1]} -c $CI_PROJECT_DIR/.gitlab/configs/$CONF.kibot.yaml -d $CI_PROJECT_DIR/Fabrication/${dir_arr[i-1]} $VARIANTS $CONF
           done
           mv $CI_PROJECT_DIR/Fabrication/${dir_arr[i-1]}/*.zip Fabrication/ 2> /dev/null || true
         done