Kibot variants were not working with groups as expected, so config
structure has been changed to not use groups
This commit is contained in:
@@ -87,9 +87,26 @@ outputs:
|
||||
- name: 'bom_csv'
|
||||
type: bom
|
||||
dir: .
|
||||
extends: "_bom"
|
||||
disable_run_by_default: _bom
|
||||
options:
|
||||
columns:
|
||||
- field: Value
|
||||
name: value
|
||||
- field: Quantity Per PCB
|
||||
name: qty
|
||||
- field: Footprint
|
||||
name: footprint
|
||||
- field: Datasheet
|
||||
name: datasheet
|
||||
- mpn
|
||||
- manf
|
||||
- rev
|
||||
- conn_manf
|
||||
- conn_mpn
|
||||
- field: References
|
||||
name: refs
|
||||
exclude_filter: ""
|
||||
output: "%f%v_%r_%i.%x"
|
||||
expand_text_vars: true
|
||||
csv:
|
||||
separator: ';'
|
||||
hide_pcb_info: true
|
||||
@@ -99,9 +116,26 @@ outputs:
|
||||
- name: 'bom_xlsx'
|
||||
type: bom
|
||||
dir: .
|
||||
extends: '_bom'
|
||||
disable_run_by_default: _bom
|
||||
options:
|
||||
columns:
|
||||
- field: Value
|
||||
name: value
|
||||
- field: Quantity Per PCB
|
||||
name: qty
|
||||
- field: Footprint
|
||||
name: footprint
|
||||
- field: Datasheet
|
||||
name: datasheet
|
||||
- mpn
|
||||
- manf
|
||||
- rev
|
||||
- conn_manf
|
||||
- conn_mpn
|
||||
- field: References
|
||||
name: refs
|
||||
exclude_filter: ""
|
||||
output: "%f%v_%r_%i.%x"
|
||||
expand_text_vars: true
|
||||
xlsx:
|
||||
hide_pcb_info: true
|
||||
hide_stats_info: true
|
||||
@@ -272,7 +306,6 @@ groups:
|
||||
- name: pcb_main
|
||||
outputs:
|
||||
- JLCPCB_compress
|
||||
- neo_position
|
||||
- print_pcb
|
||||
- stencil
|
||||
- interactive_bom
|
||||
@@ -280,7 +313,6 @@ groups:
|
||||
- name: panel
|
||||
outputs:
|
||||
- JLCPCB_compress
|
||||
- neo_position
|
||||
- print_pcb
|
||||
- step
|
||||
- interactive_bom
|
||||
|
||||
@@ -4,6 +4,7 @@ kibot:
|
||||
|
||||
import:
|
||||
- file: default.kibot.yaml
|
||||
outputs: ['step']
|
||||
|
||||
preflight:
|
||||
erc: false
|
||||
|
||||
@@ -4,6 +4,7 @@ kibot:
|
||||
|
||||
import:
|
||||
- file: default.kibot.yaml
|
||||
outputs: [JLCPCB_compress, neo_position, print_pcb, step, interactive_bom]
|
||||
|
||||
preflight:
|
||||
erc: false
|
||||
|
||||
@@ -4,6 +4,7 @@ kibot:
|
||||
|
||||
import:
|
||||
- file: default.kibot.yaml
|
||||
outputs: [print_pcb]
|
||||
|
||||
preflight:
|
||||
erc: false
|
||||
|
||||
@@ -4,6 +4,7 @@ kibot:
|
||||
|
||||
import:
|
||||
- file: default.kibot.yaml
|
||||
outputs: [JLCPCB_gerbers, JLCPCB_drill, JLCPCB_compress, print_pcb, stencil]
|
||||
|
||||
preflight:
|
||||
erc: false
|
||||
|
||||
@@ -4,8 +4,9 @@ kibot:
|
||||
|
||||
import:
|
||||
- file: default.kibot.yaml
|
||||
outputs: ['neo_position']
|
||||
|
||||
preflight:
|
||||
erc: false
|
||||
update_xml: false
|
||||
drc: true
|
||||
drc: false
|
||||
|
||||
@@ -3,6 +3,7 @@ kibot:
|
||||
|
||||
import:
|
||||
- file: default.kibot.yaml
|
||||
outputs: ['bom_csv','bom_xlsx', 'print_sch', 'interactive_bom']
|
||||
|
||||
preflight:
|
||||
erc: true
|
||||
|
||||
@@ -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/configs/$CONF.kibot.yaml -d $CI_PROJECT_DIR/Fabrication/${dir_arr[i-1]} $VARIANTS $CONF
|
||||
kibot -e ${dir_arr[i-1]}/${sch_arr[i-1]} -c $CI_PROJECT_DIR/.gitlab/configs/$CONF.kibot.yaml -d $CI_PROJECT_DIR/Fabrication/${dir_arr[i-1]} $VARIANTS
|
||||
done
|
||||
mv $CI_PROJECT_DIR/Fabrication/${dir_arr[i-1]}/*.zip Fabrication/ 2> /dev/null || true
|
||||
done
|
||||
|
||||
Reference in New Issue
Block a user