diff --git a/default.kibot.yaml b/default.kibot.yaml index d35730c..f4c7d59 100644 --- a/default.kibot.yaml +++ b/default.kibot.yaml @@ -4,10 +4,6 @@ kibot: import: - file: JLCPCB - definitions: - _KIBOT_POS_ENABLED: false - _KIBOT_BOM_ENABLED: false - _KIBOT_MANF_DIR_COMP: "%f-%r" preflight: run_erc: true @@ -29,6 +25,7 @@ global: environment: user_templates: "${CI_PROJECT_DIR}/.gitlab" + outputs: - name: 'print_sch' comment: "Print schematic (PDF)" @@ -42,7 +39,7 @@ outputs: type: pcb_print dir: . options: - output: "%f_%r_%i.%x" + output: "%f_%r_PCB.%x" pages: - layers: - layer: F.Cu @@ -69,6 +66,8 @@ outputs: - field: References name: refs exclude_filter: "" + output: "%f_%r_%i.%x" + expand_text_vars: true disable_run_by_default: true - name: 'bom_csv' @@ -81,7 +80,6 @@ outputs: hide_pcb_info: true hide_stats_info: true format: "CSV" - output: "%f_%r_%i.%x" - name: 'bom_xlsx' type: bom @@ -89,10 +87,11 @@ outputs: extends: '_bom' options: xlsx: - logo: "${CI_PROJECT_DIR}/.gitlab/micromelon_default/meta/icon.png" + # this is a relative path unfortunately + logo: "../.gitlab/micromelon_default/meta/icon.png" hide_pcb_info: true hide_stats_info: true - format: "xlsx" + format: "XLSX" # - name: 'drill' # comment: "excellon drill files" @@ -122,7 +121,7 @@ outputs: - name: 'stencil' comment: '3D printable stencil for when you forgot to order it' type: stencil_3d - dir: '3D Stencil' + dir: '3D_Stencil' options: output: '%f_%r_%i.%x' @@ -142,11 +141,18 @@ outputs: only_different: true pcb: false old: KIBOT_TAG-0 + + - name: 'JLCPCB_compress' + type: compress + extends: _JLCPCB_compress + options: + output: '%f_%r_JLC.%x' + groups: - name: pcb outputs: - - _JLCPCB_compress + - JLCPCB_compress - neo_position - print_pcb - stencil @@ -156,3 +162,8 @@ groups: - bom_csv - bom_xlsx - print_sch +... +definitions: + _KIBOT_POS_ENABLED: false + _KIBOT_BOM_ENABLED: false + _KIBOT_MANF_DIR_COMP: "." diff --git a/kibot-ci.yml b/kibot-ci.yml index d8b543e..9caa087 100644 --- a/kibot-ci.yml +++ b/kibot-ci.yml @@ -32,9 +32,9 @@ image: .commands: get_files: - - FILES=$(find $CI_PROJECT_DIR -name *$SEARCH) + - FILES=$(find . -name *$SEARCH -not -path "./.gitlab/*") get_dirs: - - FILES=$(find CI_PROJECT_DIR -name *$SEARCH) + - FILES=$(find . -name *$SEARCH -not -path "./.gitlab/*") - | if [[ $FILES == "" ]]; then DIRS="" @@ -56,12 +56,12 @@ image: - | for i in $(seq 1 $END) do - if [[ ${dir_arr[i-1]} == "$CI_PROJECT_DIR/Frame" ]]; then + if [[ ${dir_arr[i-1]} == "./Frame" ]]; then continue fi echo ${dir_arr[i-1]} echo ${sch_arr[i-1]} - cd $CI_PROJECT_DIR/${dir_arr[i-1]} + cd ${dir_arr[i-1]} kibot -e ${sch_arr[i-1]} -c $CI_PROJECT_DIR/.gitlab/default.kibot.yaml -d $CI_PROJECT_DIR/Fabrication/${dir_arr[i-1]} -s $SUFFIX done - cd $CI_PROJECT_DIR @@ -73,7 +73,7 @@ image: for d in $DIRS do echo $d - cd $CI_PROJECT_DIR/$d + cd $d JSON=$(find *_panel.json) NAME=$(echo "${JSON%.json}") PCB=$(find *.kicad_pcb) @@ -81,7 +81,7 @@ image: kikit panelize -p $JSON $PCB $CI_PROJECT_DIR/$NAME/$NAME.kicad_pcb touch $CI_PROJECT_DIR/$NAME/$NAME.kicad_sch cp fp-lib-table $CI_PROJECT_DIR/$NAME/ - python3 $CI_PROJECT_DIR/.scripts/post_panel.py $CI_PROJECT_DIR/$NAME/$NAME.kicad_pro $PCB + python3 $CI_PROJECT_DIR/.gitlab/.scripts/post_panel.py $CI_PROJECT_DIR/$NAME/$NAME.kicad_pro $PCB done - cd $CI_PROJECT_DIR @@ -91,11 +91,11 @@ image: - | for d in $DIRS do - if [[ $d == "$CI_PROJECT_DIR/Frame" ]]; then + if [[ $d == "./Frame" ]]; then continue fi echo $d - python3 .scripts/neo.py $d + python3 $CI_PROJECT_DIR/.gitlab/.scripts/neo.py $d done git_tag: @@ -179,6 +179,3 @@ release_job: links: - name: All Fab url: "${CI_PROJECT_URL}/-/jobs/${CI_JOB_ID}/artifacts/download" - links: - - name: All Fab - url: "${CI_PROJECT_URL}/-/jobs/${CI_JOB_ID}/artifacts/download"