From 2663e63353d3968fe7606ad849aab307a3a763a0 Mon Sep 17 00:00:00 2001
From: andrewc <andrew@micromelon.com.au>
Date: Tue, 20 May 2025 14:48:10 +1000
Subject: [PATCH] Fixed up where variant sits in output names, testing CI

---
 default.kibot.yaml | 22 +++++++++++-----------
 kibot-ci.yml       |  3 +++
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/default.kibot.yaml b/default.kibot.yaml
index 7ebbd24..845f0ad 100644
--- a/default.kibot.yaml
+++ b/default.kibot.yaml
@@ -34,14 +34,14 @@ outputs:
     type: pdf_sch_print
     dir: .
     options:
-      output: "%f%v_%r_%i.%x"
+      output: "%f_%r%v_%i.%x"
 
   - name: 'print_pcb'
     comment: "Print Top and Bottom Copper+Silk"
     type: pcb_print
     dir: .
     options:
-      output: "%f%v_%r_PCB.%x"
+      output: "%f_%r%v_PCB.%x"
       pages: 
         - layers:
           - layer: F.Cu
@@ -73,7 +73,7 @@ outputs:
         - field: References
           name: refs 
       exclude_filter: ""
-      output: "%f%v_%r_%i.%x"
+      output: "%f_%r%v_%i.%x"
       expand_text_vars: true
 
   - name: 'bom_csv'  
@@ -112,7 +112,7 @@ outputs:
     type: step
     dir: .
     options:
-      output: '%f%v_%r.%x'
+      output: '%f_%r%v.%x'
       download: false
       subst_models: true
 
@@ -128,7 +128,7 @@ outputs:
       download: false
       download_lcsc: false
       orthographic: true
-      output: 'PCB_%f%v_%r.%x'
+      output: 'PCB_%f_%r%v.%x'
       show_components: 'none'
 
   - name: 'pcba_render'
@@ -143,14 +143,14 @@ outputs:
       zoom: -1
       download_lcsc: false
       orthographic: true
-      output: 'PCBA_%f%v_%r.%x'
+      output: 'PCBA_%f_%r%v.%x'
       show_components: 'all'
 
   - name: 'neo_position'
     comment: "Pick and place"
     type: position
     options:
-      output: '%f%v_%r_cpl.%x'
+      output: '%f_%r%v_cpl.%x'
       format: CSV
       units: millimeters
       separate_files_for_front_and_back: false
@@ -161,7 +161,7 @@ outputs:
     type: stencil_3d
     dir: '3D_Stencil'
     options: 
-      output: '%f%v_%r_%i.%x'
+      output: '%f_%r%v_%i.%x'
 
   - name: 'diff_pcb'
     comment: "Diff for visual comparison"
@@ -185,7 +185,7 @@ outputs:
     type: ibom
     dir: .
     options: 
-      output: '%f%v_%r_%i.%x'
+      output: '%f_%r%v_%i.%x'
       dark_mode: true
 
   - name: JLCPCB_gerbers
@@ -238,7 +238,7 @@ outputs:
       metric_units: true
       map: gerber
       route_mode_for_oval_holes: false
-      output: "%f%v%i.%x"
+      output: "%f_%r%v_%i.%x"
 
   - name: 'JLCPCB_compress'
     comment: ZIP file for JLCPCB
@@ -249,7 +249,7 @@ outputs:
           dest: /
         - from_output: JLCPCB_drill
           dest: /
-      output: '%f%v_%r_JLC.%x'
+      output: '%f_%r%v_JLC.%x'
 # groups:
 #   - name: pcb
 #     outputs:
diff --git a/kibot-ci.yml b/kibot-ci.yml
index d98dee9..60fd565 100644
--- a/kibot-ci.yml
+++ b/kibot-ci.yml
@@ -160,6 +160,7 @@ image:
           name=$(echo $f | cut -c3- | cut -d'-' -f1)A
           fab_path=$CI_PROJECT_DIR/Fabrication/$(dirname $f | cut -c3-)
           name_n_rev=$(echo $f | cut -c3- | rev | cut -d'/' -f1 | cut -c9- | rev)
+          echo "name: $name_n_rev"
           pcb_im=$fab_path/PCB_$name_n_rev.png
           pcba_im=$fab_path/PCBA_$name_n_rev.png
           pcb_attach=$(echo "['$fab_path/${name_n_rev}_PCB.pdf', '$CI_PROJECT_DIR/Fabrication/${name_n_rev}_JLC.zip']")
@@ -265,6 +266,8 @@ outputs_dev:
 
 outputs_main:
   extends: outputs_dev
+  rules:
+    - !reference [.main_rules, rules]
   script:
     # SCH
     - VARIANTS="$VARIANTS_SCH"