From 2efdbe6d172962dcd42bc31cabb8c79d9bcf3e48 Mon Sep 17 00:00:00 2001
From: Andrew Collins <andrew@micromelon.com.au>
Date: Mon, 17 Feb 2025 04:53:56 +0000
Subject: [PATCH] Fixed up pre-push hook

---
 .scripts/ki-ntree      |  2 +-
 .scripts/post_panel.py |  2 ++
 default.kibot.yaml     |  7 +++++++
 hooks/pre-push         |  2 +-
 kibot-ci.yml           | 21 +++++++++++++--------
 5 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/.scripts/ki-ntree b/.scripts/ki-ntree
index 26ff988..c66d40d 160000
--- a/.scripts/ki-ntree
+++ b/.scripts/ki-ntree
@@ -1 +1 @@
-Subproject commit 26ff98818f03b57fa29b7d6d1a3ff301caf7794e
+Subproject commit c66d40daf798f7d876e2213f15f004e8f253672b
diff --git a/.scripts/post_panel.py b/.scripts/post_panel.py
index c4e905d..812700d 100644
--- a/.scripts/post_panel.py
+++ b/.scripts/post_panel.py
@@ -25,6 +25,8 @@ src = json.loads(json_str)
 json_file = open(proj)
 json_str = json_file.read() 
 dest = json.loads(json_str)
+dest["board"]["design_settings"]["rule_severities"]["duplicate_footprints"] = "ignore"
+dest["board"]["design_settings"]["rule_severities"]["extra_footprint"] = "ignore"
 dest["board"]["design_settings"]["rule_severities"]["lib_footprint_issues"] = "ignore"
 dest["board"]["design_settings"]["rule_severities"]["lib_footprint_mismatch"] = "ignore"
 dest["board"]["design_settings"]["rule_severities"]["hole_near_hole"] = "ignore"
diff --git a/default.kibot.yaml b/default.kibot.yaml
index df37db6..74623da 100644
--- a/default.kibot.yaml
+++ b/default.kibot.yaml
@@ -255,6 +255,13 @@ groups:
       - stencil
       - interactive_bom
 
+  - name: pcb_panel
+    outputs:
+      - JLCPCB_compress
+      - neo_position
+      - print_pcb
+      - interactive_bom
+
   - name: sch
     outputs:
       - bom_csv
diff --git a/hooks/pre-push b/hooks/pre-push
index 957611a..19e1085 100755
--- a/hooks/pre-push
+++ b/hooks/pre-push
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-kimelon unlock all 
+kimelon git unlock all 
 
 command -v git-lfs >/dev/null 2>&1 || { echo >&2 "\nThis repository is configured for Git LFS but 'git-lfs' was not found on your path. If you no longer wish to use Git LFS, remove this hook by deleting '.git/hooks/pre-push'.\n"; exit 2; }
 git lfs pre-push "$@"
diff --git a/kibot-ci.yml b/kibot-ci.yml
index bfe9f89..4aa745b 100644
--- a/kibot-ci.yml
+++ b/kibot-ci.yml
@@ -75,7 +75,6 @@ image:
     - !reference [.commands, sch_from_pro]  
     - sch_arr=($SCHEMS)
     - |
-      cd $CI_PROJECT_DIR
       for i in $(seq 1 $END)
         do
           if [[ ${dir_arr[i-1]} == "./Frame" ]]; then
@@ -93,6 +92,7 @@ image:
     - 'SEARCH="_panel.json"'
     - !reference [.commands, get_dirs]  
     - |
+          mkdir panels
           cd $CI_PROJECT_DIR
           for d in $DIRS
             do
@@ -103,14 +103,17 @@ image:
               NAME=$(echo "${FILE%.json}")
               PCB=$(find $d/*.kicad_pcb)
               echo "mkdring"
-              mkdir $NAME
+              mkdir -p panels/$NAME
               echo "panelising"
-              kikit panelize -p $JSON $PCB $NAME/$NAME.kicad_pcb
-              cp .gitlab/micromelon_default/micromelon_default.kicad_sch $NAME/$NAME.kicad_sch
-              cp $d/fp-lib-table $NAME/
-              python3 .gitlab/.scripts/post_panel.py $NAME/$NAME.kicad_pro $PCB
+              kikit panelize -p $JSON $PCB panels/$NAME/$NAME.kicad_pcb
+              cp .gitlab/micromelon_default/micromelon_default.kicad_sch panels/$NAME/$NAME.kicad_sch
+              cp $d/fp-lib-table panels/$NAME/
+              python3 .gitlab/.scripts/post_panel.py panels/$NAME/$NAME.kicad_pro $PCB
             done
-    - cd $CI_PROJECT_DIR
+    - cd panels || true
+    - !reference [.commands, kibot]
+    - mv panels/* .
+    - rm -rf panels/
 
   neo:
     - 'SEARCH=".kicad_pro"'
@@ -268,13 +271,15 @@ outputs_all:
   variables:
     SUFF_SCH: drc sch
     SUFF_PCB: erc,update_xml,set_text_variables pcb
+    SUFF_PANEL: erc,update_xml,set_text_variables pcb_panel
   script:
     - !reference [.commands, git_tag]
     - SUFFIX=$SUFF_SCH
     - !reference [.commands, kibot]
     - SUFFIX=$SUFF_PCB
-    - !reference [.commands, panel]
     - !reference [.commands, kibot]
+    - SUFFIX=$SUFF_PANEL
+    - !reference [.commands, panel]
     - !reference [.commands, neo]
     - ls Fabrication/