From accd10e804a7f8580fccdd5f76696bb411755e5b Mon Sep 17 00:00:00 2001 From: ac Date: Sat, 30 Dec 2023 16:26:20 +1000 Subject: [PATCH] Attempt to filter folders --- kibot-ci.yml | 47 ++++++++++++++++++++++++++++------------------- 1 file changed, 28 insertions(+), 19 deletions(-) diff --git a/kibot-ci.yml b/kibot-ci.yml index 85a7fb6..d2baac3 100644 --- a/kibot-ci.yml +++ b/kibot-ci.yml @@ -38,36 +38,45 @@ image: get_dirs: - FILES=$(find . -name *$SEARCH -not -path "./.gitlab/*") - | - if [[ $FILES == "" ]]; then - DIRS="" - else - DIRS=$(dirname $FILES) - fi + if [[ $FILES == "" ]]; then + DIRS="" + else + DIRS=$(dirname $FILES) + fi sch_from_pro: - 'SCHEMS=$(for f in $FILES ; do echo "${f%.*}.kicad_sch"; done)' - 'SCHEMS=$(for f in $SCHEMS ; do echo "${f##**/}"; done)' dir_arr: - !reference [.commands, get_dirs] - - END=$(wc -w <<< $DIRS) - - dir_arr=($DIRS) + - | + FILTERED=$(echo "") + for d in $DIRS + do + if [[ "$d" =~ ^[0-9]{4}-.*$ ]] + then + FILTERED=$(echo "$FILTERED $d") + fi + done + END=$(wc -w <<< $FILTERED) + dir_arr=($FILTERED) kibot: - 'SEARCH=".kicad_pro"' - !reference [.commands, dir_arr] - !reference [.commands, sch_from_pro] - sch_arr=($SCHEMS) - | - cd $CI_PROJECT_DIR - for i in $(seq 1 $END) - do - if [[ ${dir_arr[i-1]} == "./Frame" ]]; then - continue - fi - echo ${dir_arr[i-1]} - echo ${sch_arr[i-1]} - python3 $CI_PROJECT_DIR/.gitlab/.scripts/orig.py ${dir_arr[i-1]} - kibot -e ${dir_arr[i-1]}/${sch_arr[i-1]} -c $CI_PROJECT_DIR/.gitlab/default.kibot.yaml -d $CI_PROJECT_DIR/Fabrication/${dir_arr[i-1]} -s $SUFFIX - mv $CI_PROJECT_DIR/Fabrication/${dir_arr[i-1]}/*.zip Fabrication/ 2> /dev/null || true - done + cd $CI_PROJECT_DIR + for i in $(seq 1 $END) + do + if [[ ${dir_arr[i-1]} == "./Frame" ]]; then + continue + fi + echo ${dir_arr[i-1]} + echo ${sch_arr[i-1]} + python3 $CI_PROJECT_DIR/.gitlab/.scripts/orig.py ${dir_arr[i-1]} + kibot -e ${dir_arr[i-1]}/${sch_arr[i-1]} -c $CI_PROJECT_DIR/.gitlab/default.kibot.yaml -d $CI_PROJECT_DIR/Fabrication/${dir_arr[i-1]} -s $SUFFIX + mv $CI_PROJECT_DIR/Fabrication/${dir_arr[i-1]}/*.zip Fabrication/ 2> /dev/null || true + done - cd $CI_PROJECT_DIR panel: