From a69e5a291e1b0e507a7c119cb256fc92d2317698 Mon Sep 17 00:00:00 2001 From: ac Date: Tue, 24 Jun 2025 11:42:48 +1000 Subject: [PATCH] Fixed up inventree rev --- .gitmodules | 4 ---- .scripts/ki-ntree | 1 - kibot-ci.yml | 5 +++-- 3 files changed, 3 insertions(+), 7 deletions(-) delete mode 160000 .scripts/ki-ntree diff --git a/.gitmodules b/.gitmodules index a2d914a..02916e8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,7 +2,3 @@ path = kicad-footprint-generator url = git@gitlab.com:acmelon/kicad-footprint-generator.git branch = offset_fix -[submodule ".scripts/ki-ntree"] - path = .scripts/ki-ntree - url = https://github.com/Andrew-Collins/Ki-nTree - branch = cli diff --git a/.scripts/ki-ntree b/.scripts/ki-ntree deleted file mode 160000 index f1e2306..0000000 --- a/.scripts/ki-ntree +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f1e2306633a3c4a0a7e60f8c08ed9bcca06d7e16 diff --git a/kibot-ci.yml b/kibot-ci.yml index 4349384..d0507a8 100644 --- a/kibot-ci.yml +++ b/kibot-ci.yml @@ -157,10 +157,11 @@ image: do echo $f name=$(echo $f | cut -c3- | cut -d'-' -f1)A + rev=$(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" - assembly_rev=$(echo $f | cut -c3- | rev | cut -d'/' -f1 | cut -c9- | rev) + assembly_rev=$(echo $name_n_rev | cut -d'_' -f2) pcb_rev=$(echo $assembly_rev | cut -d'_' -f1,2 | cut -d'.' -f1,2) pcb_im=$fab_path/PCB_$name_n_rev.png pcba_im=$fab_path/PCBA_$name_n_rev.png @@ -172,7 +173,7 @@ image: DRY="" fi echo "Revs: $pcb_rev, $assembly_rev" - python -m kintree.kintree_cli $DRY -p $CI_PROJECT_DIR/Fabrication/$f --assembly "{'ipn': '$name', 'rev': '($pcb_rev, $assembly_rev)', 'image': ['$pcb_im', '$pcba_im'], 'desc': '$desc_suffix', 'attachments': [$pcb_attach, $pcba_attach]}" --settings $KINTREE_SETT --digi_token token_storage.json || FAIL=1 + python -m kintree.kintree_cli $DRY -p $CI_PROJECT_DIR/Fabrication/$f --assembly "{'ipn': '$name', 'rev': ['$pcb_rev', '$assembly_rev'], 'image': ['$pcb_im', '$pcba_im'], 'desc': '$desc_suffix', 'attachments': [$pcb_attach, $pcba_attach]}" --settings $KINTREE_SETT --digi_token token_storage.json || FAIL=1 done # - cp token_storage.json /tmp - |