Fixed up pre-push hook

This commit is contained in:
Andrew Collins
2025-02-17 04:53:56 +00:00
parent 530a0cb537
commit 2efdbe6d17
5 changed files with 24 additions and 10 deletions

View File

@@ -75,7 +75,6 @@ image:
- !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
@@ -93,6 +92,7 @@ image:
- 'SEARCH="_panel.json"'
- !reference [.commands, get_dirs]
- |
mkdir panels
cd $CI_PROJECT_DIR
for d in $DIRS
do
@@ -103,14 +103,17 @@ image:
NAME=$(echo "${FILE%.json}")
PCB=$(find $d/*.kicad_pcb)
echo "mkdring"
mkdir $NAME
mkdir -p panels/$NAME
echo "panelising"
kikit panelize -p $JSON $PCB $NAME/$NAME.kicad_pcb
cp .gitlab/micromelon_default/micromelon_default.kicad_sch $NAME/$NAME.kicad_sch
cp $d/fp-lib-table $NAME/
python3 .gitlab/.scripts/post_panel.py $NAME/$NAME.kicad_pro $PCB
kikit panelize -p $JSON $PCB panels/$NAME/$NAME.kicad_pcb
cp .gitlab/micromelon_default/micromelon_default.kicad_sch panels/$NAME/$NAME.kicad_sch
cp $d/fp-lib-table panels/$NAME/
python3 .gitlab/.scripts/post_panel.py panels/$NAME/$NAME.kicad_pro $PCB
done
- cd $CI_PROJECT_DIR
- cd panels || true
- !reference [.commands, kibot]
- mv panels/* .
- rm -rf panels/
neo:
- 'SEARCH=".kicad_pro"'
@@ -268,13 +271,15 @@ outputs_all:
variables:
SUFF_SCH: drc sch
SUFF_PCB: erc,update_xml,set_text_variables pcb
SUFF_PANEL: erc,update_xml,set_text_variables pcb_panel
script:
- !reference [.commands, git_tag]
- SUFFIX=$SUFF_SCH
- !reference [.commands, kibot]
- SUFFIX=$SUFF_PCB
- !reference [.commands, panel]
- !reference [.commands, kibot]
- SUFFIX=$SUFF_PANEL
- !reference [.commands, panel]
- !reference [.commands, neo]
- ls Fabrication/