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
dest: /
output: '%f%v_%r_JLC.%x'
# groups:
# - name: pcb
# outputs:
# - JLCPCB_compress
# - neo_position
# - print_pcb
# - stencil
# - interactive_bom
#
# - name: pcb_panel
# outputs:
# - JLCPCB_compress
# - neo_position
# - print_pcb
# - step
# - interactive_bom
#
# - name: sch
# outputs:
# - bom_csv
# - bom_xlsx
# - print_sch
groups:
- name: mech
outputs:
- step
- name: pos
outputs:
- neo_position
- name: pcb_dev
outputs:
- print_pcb
- name: pcb_main
outputs:
- JLCPCB_compress
- neo_position
- print_pcb
- stencil
- interactive_bom
- name: panel
outputs:
- JLCPCB_compress
- neo_position
- print_pcb
- step
- interactive_bom
- name: sch
outputs:
- bom_csv
- bom_xlsx
- print_sch
...
definitions:
_KIBOT_POS_ENABLED: false

View File

@@ -90,7 +90,7 @@ image:
python3 $CI_PROJECT_DIR/.gitlab/.scripts/orig.py ${dir_arr[i-1]}
for CONF in $KIBOT_CONF
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
mv $CI_PROJECT_DIR/Fabrication/${dir_arr[i-1]}/*.zip Fabrication/ 2> /dev/null || true
done

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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