diff --git a/.gitmodules b/.gitmodules index 61ed493..a2d914a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -5,4 +5,4 @@ [submodule ".scripts/ki-ntree"] path = .scripts/ki-ntree url = https://github.com/Andrew-Collins/Ki-nTree - branch = cli + branch = cli diff --git a/.scripts/ki-ntree b/.scripts/ki-ntree index 316a11d..8d79d0b 160000 --- a/.scripts/ki-ntree +++ b/.scripts/ki-ntree @@ -1 +1 @@ -Subproject commit 316a11d0da0ca59095148f38f2c6fe77b4d71948 +Subproject commit 8d79d0b318a1f9a441d3963aa396cb68d7541be6 diff --git a/kibot-ci.yml b/kibot-ci.yml index 5b467f0..6b67a2d 100644 --- a/kibot-ci.yml +++ b/kibot-ci.yml @@ -129,6 +129,7 @@ image: - cd $CI_PROJECT_DIR/.gitlab/.scripts/ki-ntree/ - apt update && apt install pip -y && pip install --break-system-packages poetry - poetry install + - ls - cd $CI_PROJECT_DIR/Fabrication - 'SEARCH="bom.csv"' - !reference [.commands, strip_tag] @@ -138,8 +139,8 @@ image: for f in $FILES do echo $f - name=$(echo $f | cut -d'-' -f1)A - poetry run python -m kintree_cli -p $f --assembly "{'ipn': '$name', 'rev': '$TAG'}" --settings_inv $KINTREE_SETT_INV --settings_ipn $KINTREE_SETT_IPN + 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 $KINTREE_DIGI_TOKEN done