diff --git a/.scripts/ki-ntree b/.scripts/ki-ntree index 64598e4..c77c9e4 160000 --- a/.scripts/ki-ntree +++ b/.scripts/ki-ntree @@ -1 +1 @@ -Subproject commit 64598e47ba039d1aa8e7a22e9fcec75ff42aaa27 +Subproject commit c77c9e44d4a12437076e6cc0155a17c11aaf918f diff --git a/kibot-ci.yml b/kibot-ci.yml index 35a4602..65499fb 100644 --- a/kibot-ci.yml +++ b/kibot-ci.yml @@ -158,7 +158,12 @@ image: 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']") 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 + + DRY="" + if [[ $CI_COMMIT_BRANCH == "dev" ]]; then + DRY="--dry" + fi + poetry run python -m kintree_cli $DRY -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 # - cp token_storage.json /tmp - | @@ -281,9 +286,7 @@ inventree_job: - job: outputs_all artifacts: true rules: - - if: $CI_COMMIT_TAG - when: never # Do not run this job when a tag is created manually - - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH # Run this job when commits are pushed or merged to the default branch + - !reference [.dev_rules, rules] script: - !reference [.commands, boms]