From 0ed550e61351cf173695c724216829fd477baf9f Mon Sep 17 00:00:00 2001
From: andrewc <andrew@micromelon.com.au>
Date: Mon, 9 Jun 2025 15:06:33 +1000
Subject: [PATCH] Changed to using groups again, separate configs for each
 group currently

---
 default.kibot.yaml  | 56 +++++++++++++++++++++++++++------------------
 kibot-ci.yml        |  2 +-
 mech.kibot.yaml     |  2 --
 panel.kibot.yaml    |  6 -----
 pcb_dev.kibot.yaml  |  2 --
 pcb_main.kibot.yaml |  7 ------
 pos.kibot.yaml      |  2 --
 sch.kibot.yaml      |  5 ----
 8 files changed, 35 insertions(+), 47 deletions(-)

diff --git a/default.kibot.yaml b/default.kibot.yaml
index 769d550..cc7a800 100644
--- a/default.kibot.yaml
+++ b/default.kibot.yaml
@@ -252,28 +252,40 @@ outputs:
         - from_output: JLCPCB_drill
           dest: /
       output: '%f%v_%r_JLC.%x'
-# groups:
-#   - name: pcb
-#     outputs:
-#       - JLCPCB_compress
-#       - neo_position
-#       - print_pcb
-#       - stencil
-#       - interactive_bom
-#
-#   - name: pcb_panel
-#     outputs:
-#       - JLCPCB_compress
-#       - neo_position
-#       - print_pcb
-#       - step
-#       - interactive_bom
-#
-#   - name: sch
-#     outputs:
-#       - bom_csv
-#       - bom_xlsx
-#       - print_sch
+groups:
+  - name: mech
+    outputs:
+      - step
+
+  - name: pos
+    outputs:
+      - neo_position
+
+  - name: pcb_dev
+    outputs:
+      - print_pcb
+
+  - name: pcb_main
+    outputs:
+      - JLCPCB_compress
+      - neo_position
+      - print_pcb
+      - stencil
+      - interactive_bom
+
+  - name: panel
+    outputs:
+      - JLCPCB_compress
+      - neo_position
+      - print_pcb
+      - step
+      - interactive_bom
+
+  - name: sch
+    outputs:
+      - bom_csv
+      - bom_xlsx
+      - print_sch
 ...
 definitions:
   _KIBOT_POS_ENABLED: false
diff --git a/kibot-ci.yml b/kibot-ci.yml
index 2c9b772..eeed13a 100644
--- a/kibot-ci.yml
+++ b/kibot-ci.yml
@@ -90,7 +90,7 @@ image:
           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
+            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
           done
           mv $CI_PROJECT_DIR/Fabrication/${dir_arr[i-1]}/*.zip Fabrication/ 2> /dev/null || true
         done
diff --git a/mech.kibot.yaml b/mech.kibot.yaml
index d700e8a..d3e8086 100644
--- a/mech.kibot.yaml
+++ b/mech.kibot.yaml
@@ -4,8 +4,6 @@ kibot:
 
 import:
   - file: default.kibot.yaml
-    outputs:
-      - step
 
 preflight:
   erc: false
diff --git a/panel.kibot.yaml b/panel.kibot.yaml
index 6a0c242..d107b67 100644
--- a/panel.kibot.yaml
+++ b/panel.kibot.yaml
@@ -4,12 +4,6 @@ kibot:
 
 import:
   - file: default.kibot.yaml
-    outputs:
-      - JLCPCB_compress
-      - neo_position
-      - print_pcb
-      - step
-      - interactive_bom
 
 preflight:
   erc: false
diff --git a/pcb_dev.kibot.yaml b/pcb_dev.kibot.yaml
index 23ef335..d107b67 100644
--- a/pcb_dev.kibot.yaml
+++ b/pcb_dev.kibot.yaml
@@ -4,8 +4,6 @@ kibot:
 
 import:
   - file: default.kibot.yaml
-    outputs:
-      - print_pcb
 
 preflight:
   erc: false
diff --git a/pcb_main.kibot.yaml b/pcb_main.kibot.yaml
index 36bf3f4..d107b67 100644
--- a/pcb_main.kibot.yaml
+++ b/pcb_main.kibot.yaml
@@ -4,13 +4,6 @@ kibot:
 
 import:
   - file: default.kibot.yaml
-    outputs:
-      - JLCPCB_gerbers
-      - JLCPCB_drill
-      - JLCPCB_compress
-      - print_pcb
-      - stencil
-      - interactive_bom
 
 preflight:
   erc: false
diff --git a/pos.kibot.yaml b/pos.kibot.yaml
index bd2829c..d107b67 100644
--- a/pos.kibot.yaml
+++ b/pos.kibot.yaml
@@ -4,8 +4,6 @@ kibot:
 
 import:
   - file: default.kibot.yaml
-    outputs:
-      - neo_position
 
 preflight:
   erc: false
diff --git a/sch.kibot.yaml b/sch.kibot.yaml
index 6f754a5..955573f 100644
--- a/sch.kibot.yaml
+++ b/sch.kibot.yaml
@@ -3,11 +3,6 @@ kibot:
 
 import:
   - file: default.kibot.yaml
-    outputs:
-      - print_sch
-      - _bom
-      - bom_csv
-      - bom_xlsx
 
 preflight:
   erc: true