Changed to using groups again, separate configs for each group currently

This commit is contained in:
andrewc
2025-06-09 15:06:33 +10:00
parent 15650e1e71
commit 0ed550e613
8 changed files with 35 additions and 47 deletions

View File

@@ -252,28 +252,40 @@ outputs:
- from_output: JLCPCB_drill - from_output: JLCPCB_drill
dest: / dest: /
output: '%f%v_%r_JLC.%x' output: '%f%v_%r_JLC.%x'
# groups: groups:
# - name: pcb - name: mech
# outputs: outputs:
# - JLCPCB_compress - step
# - neo_position
# - print_pcb - name: pos
# - stencil outputs:
# - interactive_bom - neo_position
#
# - name: pcb_panel - name: pcb_dev
# outputs: outputs:
# - JLCPCB_compress - print_pcb
# - neo_position
# - print_pcb - name: pcb_main
# - step outputs:
# - interactive_bom - JLCPCB_compress
# - neo_position
# - name: sch - print_pcb
# outputs: - stencil
# - bom_csv - interactive_bom
# - bom_xlsx
# - print_sch - name: panel
outputs:
- JLCPCB_compress
- neo_position
- print_pcb
- step
- interactive_bom
- name: sch
outputs:
- bom_csv
- bom_xlsx
- print_sch
... ...
definitions: definitions:
_KIBOT_POS_ENABLED: false _KIBOT_POS_ENABLED: false

View File

@@ -90,7 +90,7 @@ image:
python3 $CI_PROJECT_DIR/.gitlab/.scripts/orig.py ${dir_arr[i-1]} python3 $CI_PROJECT_DIR/.gitlab/.scripts/orig.py ${dir_arr[i-1]}
for CONF in $KIBOT_CONF for CONF in $KIBOT_CONF
do do
kibot -e ${dir_arr[i-1]}/${sch_arr[i-1]} -c $CI_PROJECT_DIR/.gitlab/$CONF.kibot.yaml -d $CI_PROJECT_DIR/Fabrication/${dir_arr[i-1]} $VARIANTS kibot -e ${dir_arr[i-1]}/${sch_arr[i-1]} -c $CI_PROJECT_DIR/.gitlab/$CONF.kibot.yaml -d $CI_PROJECT_DIR/Fabrication/${dir_arr[i-1]} $VARIANTS $CONF
done done
mv $CI_PROJECT_DIR/Fabrication/${dir_arr[i-1]}/*.zip Fabrication/ 2> /dev/null || true mv $CI_PROJECT_DIR/Fabrication/${dir_arr[i-1]}/*.zip Fabrication/ 2> /dev/null || true
done done

View File

@@ -4,8 +4,6 @@ kibot:
import: import:
- file: default.kibot.yaml - file: default.kibot.yaml
outputs:
- step
preflight: preflight:
erc: false erc: false

View File

@@ -4,12 +4,6 @@ kibot:
import: import:
- file: default.kibot.yaml - file: default.kibot.yaml
outputs:
- JLCPCB_compress
- neo_position
- print_pcb
- step
- interactive_bom
preflight: preflight:
erc: false erc: false

View File

@@ -4,8 +4,6 @@ kibot:
import: import:
- file: default.kibot.yaml - file: default.kibot.yaml
outputs:
- print_pcb
preflight: preflight:
erc: false erc: false

View File

@@ -4,13 +4,6 @@ kibot:
import: import:
- file: default.kibot.yaml - file: default.kibot.yaml
outputs:
- JLCPCB_gerbers
- JLCPCB_drill
- JLCPCB_compress
- print_pcb
- stencil
- interactive_bom
preflight: preflight:
erc: false erc: false

View File

@@ -4,8 +4,6 @@ kibot:
import: import:
- file: default.kibot.yaml - file: default.kibot.yaml
outputs:
- neo_position
preflight: preflight:
erc: false erc: false

View File

@@ -3,11 +3,6 @@ kibot:
import: import:
- file: default.kibot.yaml - file: default.kibot.yaml
outputs:
- print_sch
- _bom
- bom_csv
- bom_xlsx
preflight: preflight:
erc: true erc: true