Fixed up a few kibot options
This commit is contained in:
@@ -21,12 +21,12 @@ preflight:
|
||||
- name: 'title'
|
||||
expand_kibot_patterns: true
|
||||
command: 'echo $KIBOT_PCB_NAME | rev | cut -d"/" -f1 | rev | cut -d"." -f1 '
|
||||
fill_zones: true
|
||||
check_zone_fills: true
|
||||
|
||||
global:
|
||||
environment:
|
||||
user_templates: "${CI_PROJECT_DIR}/.gitlab"
|
||||
|
||||
restore_project: true
|
||||
|
||||
outputs:
|
||||
- name: 'print_sch'
|
||||
|
||||
@@ -139,9 +139,6 @@ image:
|
||||
- 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
|
||||
- poetry install
|
||||
- url="https://gitlab.com/api/v4/projects/${DIGI_API_PRJ_ID}/packages/generic/digikey_api/0/token_storage.json"
|
||||
- |
|
||||
if [[ -z "$KINTREE_DIGI_TOKEN" ]]; then
|
||||
@@ -172,7 +169,7 @@ image:
|
||||
if [[ $CI_COMMIT_BRANCH == "main" ]]; then
|
||||
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
|
||||
python -m kintree.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
|
||||
- |
|
||||
@@ -289,6 +286,9 @@ outputs_main:
|
||||
- !reference [.commands, neo]
|
||||
|
||||
inventree_job_dev:
|
||||
image:
|
||||
name: ghcr.io/andrew-collins/ki-ntree:cli
|
||||
entrypoint: [""]
|
||||
stage: inventree
|
||||
rules:
|
||||
- !reference [.dev_rules, rules]
|
||||
|
||||
Reference in New Issue
Block a user