public/kicad-ci
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Directory mapping corrected

Browse Source 
JLC compress output now works
Fixed up xlsx bom
Renamed pcb print output
This commit is contained in:
andrewc
2023-10-20 21:28:57 +10:00
parent c05f45bffb
commit 5f290a1b06
2 changed files with 29 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
kibot-ci.yml
View File

@@ -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"