From 111a9bc0421d4697fd8dd0f3cd53a16b1e39a582 Mon Sep 17 00:00:00 2001 From: andrewc Date: Thu, 31 Oct 2024 11:16:07 +1000 Subject: [PATCH] Add description to PCB and PCBA parts --- .scripts/ki-ntree | 2 +- kibot-ci.yml | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.scripts/ki-ntree b/.scripts/ki-ntree index bebdba0..404d443 160000 --- a/.scripts/ki-ntree +++ b/.scripts/ki-ntree @@ -1 +1 @@ -Subproject commit bebdba04aa8ef1d4567739fa2383135385d26b9b +Subproject commit 404d44352cc4fcd215db9372b6ffdcf4bc34b7e8 diff --git a/kibot-ci.yml b/kibot-ci.yml index aaa4ef0..fa3a4a5 100644 --- a/kibot-ci.yml +++ b/kibot-ci.yml @@ -126,6 +126,10 @@ image: done boms: + - ls /gcl-builds/Fabrication/999999-test/ + - client=$(echo $CI_PROJECT_PATH | cut -d'/' -f3 | sed -r 's/\<./\U&/g') + - proj=$(echo $CI_PROJECT_NAME | tr -d '0123456789' | tr '-' ' ' | sed -r 's/\<./\U&/g') + - desc_suffix=$(echo $client $proj) - cd $CI_PROJECT_DIR/.gitlab/.scripts/ki-ntree/ - apt remove libcurl4 -y - apt update && apt install curl pip -y && pip install --break-system-packages poetry @@ -149,7 +153,10 @@ image: do echo $f name=$(echo $f | cut -c3- | cut -d'-' -f1)A - poetry run python -m kintree_cli -p $CI_PROJECT_DIR/Fabrication/$f --assembly "{'ipn': '$name', 'rev': '$TAG'}" --settings $KINTREE_SETT --digi_token token_storage.json || FAIL=1 + fab_path=$CI_PROJECT_DIR/Fabrication/$(dirname $f | cut -c3-) + pcb_im=$fab_path/PCB_$(echo $f | cut -c3- | rev | cut -d'/' -f1 | cut -c9- | rev).png + pcba_im=$fab_path/PCBA_$(echo $f | cut -c3- | rev | cut -d'/' -f1 | cut -c9- | rev).png + 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'}" --settings $KINTREE_SETT --digi_token token_storage.json || FAIL=1 done # - cp token_storage.json /tmp - | @@ -267,6 +274,8 @@ outputs_all: inventree_job: stage: inventree needs: + - job: output_mech + artifacts: true - job: outputs_all artifacts: true rules: