public/kicad-ci
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed up inventree rev

Browse Source
This commit is contained in:
ac
2025-06-24 11:42:48 +10:00
parent 88d02915a4
commit a69e5a291e
3 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitmodules vendored
View File

@@ -2,7 +2,3 @@
path = kicad-footprint-generator path = kicad-footprint-generator
url = git@gitlab.com:acmelon/kicad-footprint-generator.git url = git@gitlab.com:acmelon/kicad-footprint-generator.git
branch = offset_fix branch = offset_fix
[submodule ".scripts/ki-ntree"]
path = .scripts/ki-ntree
url = https://github.com/Andrew-Collins/Ki-nTree
branch = cli

1
.scripts/ki-ntree

Submodule .scripts/ki-ntree deleted from f1e2306633

5
kibot-ci.yml
View File

@@ -157,10 +157,11 @@ image:
do do
echo $f echo $f
name=$(echo $f | cut -c3- | cut -d'-' -f1)A 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-) fab_path=$CI_PROJECT_DIR/Fabrication/$(dirname $f | cut -c3-)
name_n_rev=$(echo $f | cut -c3- | rev | cut -d'/' -f1 | cut -c9- | rev) name_n_rev=$(echo $f | cut -c3- | rev | cut -d'/' -f1 | cut -c9- | rev)
echo "name: $name_n_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_rev=$(echo $assembly_rev | cut -d'_' -f1,2 | cut -d'.' -f1,2)
pcb_im=$fab_path/PCB_$name_n_rev.png pcb_im=$fab_path/PCB_$name_n_rev.png
pcba_im=$fab_path/PCBA_$name_n_rev.png pcba_im=$fab_path/PCBA_$name_n_rev.png
@@ -172,7 +173,7 @@ image:
DRY="" DRY=""
fi fi
echo "Revs: $pcb_rev, $assembly_rev" 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 done
# - cp token_storage.json /tmp # - cp token_storage.json /tmp
- | - |