From 827bd847145a212749be13e528206bb9bf530471 Mon Sep 17 00:00:00 2001
From: andrewc <andrew@micromelon.com.au>
Date: Mon, 18 Nov 2024 14:01:35 +1000
Subject: [PATCH] Upload zipped gerbers to inventree PCB part, added revision
 to jlc zip file name

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

diff --git a/default.kibot.yaml b/default.kibot.yaml
index 00b2310..23e4af9 100644
--- a/default.kibot.yaml
+++ b/default.kibot.yaml
@@ -246,7 +246,7 @@ outputs:
           dest: /
         - from_output: JLCPCB_drill
           dest: /
-      output: '%f_JLC.%x'
+      output: '%f_%r_JLC.%x'
 groups:
   - name: pcb
     outputs:
diff --git a/kibot-ci.yml b/kibot-ci.yml
index 5196bb3..722ec6f 100644
--- a/kibot-ci.yml
+++ b/kibot-ci.yml
@@ -156,7 +156,7 @@ image:
           name_n_rev=$(echo $f | cut -c3- | rev | cut -d'/' -f1 | cut -c9- | 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']")
+          pcb_attach=$(echo "['$fab_path/${name_n_rev}_PCB.pdf', '$CI_PROJECT_DIR/Fabrication/${name_n_rev}_JLC.zip']")
           pcba_attach=$(echo "['$fab_path/${name_n_rev}_schematic.pdf', '$fab_path/${name_n_rev}_bom.csv', '$fab_path/${name_n_rev}-neo-pos_top.csv', '$fab_path/${name_n_rev}-neo-pos_bot.csv', '$fab_path/${name_n_rev}_ibom.html']")
       poetry run python -m kintree_cli -p $CI_PROJECT_DIR/Fabrication/$f --assembly "{'ipn': '$name', 'rev': '$TAG', 'image': ['$pcb_im', '$pcba_im'], 'desc': '$desc_suffix', 'attachments': [$pcb_attach, $pcba_attach]}" --settings $KINTREE_SETT --digi_token token_storage.json || FAIL=1
         done