keyboards
/
corney-island
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Freerouting docker image reference

This commit is contained in:
Marco Massarelli 2023-11-24 00:55:13 +00:00
parent 55a1f5f4d1
commit 363ed9054f
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.sh
View File

@ -11,7 +11,7 @@ plates="backplate frontplate controller_overlay"
# Define the KiCad Auto Docker image to use # Define the KiCad Auto Docker image to use
# kicad_auto_immge=ghcr.io/inti-cmnb/kicad7_auto:latest # kicad_auto_immge=ghcr.io/inti-cmnb/kicad7_auto:latest
kicad_auto_image=ceoloide/kicad_auto:nightly kicad_auto_image=ceoloide/kicad_auto:nightly
freerouting_cli=ceoloide/kicad_auto:nightly freerouting_cli_image=ceoloide/kicad_auto:nightly
# Preserve manually routed files # Preserve manually routed files
if [ -e ergogen/output/pcbs/*_manually_routed.kicad_pcb ]; then if [ -e ergogen/output/pcbs/*_manually_routed.kicad_pcb ]; then
@ -31,7 +31,7 @@ if [ -e logs/freerouting.log ]; then
fi fi
# Generate unrouted PCBs with Ergogen (definition in package.json) # Generate unrouted PCBs with Ergogen (definition in package.json)
npm run debug npm run build
# Restore manually routed files # Restore manually routed files
if [ -e ergogen/tmp/*_manually_routed.kicad_pcb ]; then if [ -e ergogen/tmp/*_manually_routed.kicad_pcb ]; then

5
rebuild.sh
View File

@ -8,6 +8,7 @@ container_args="-w /board -v $(pwd):/board --rm"
boards="corney_island_wireless" boards="corney_island_wireless"
# kicad_auto_immge=ghcr.io/inti-cmnb/kicad7_auto:latest # kicad_auto_immge=ghcr.io/inti-cmnb/kicad7_auto:latest
kicad_auto_image=ceoloide/kicad_auto:nightly kicad_auto_image=ceoloide/kicad_auto:nightly
freerouting_cli_image=ceoloide/kicad_auto:nightly
# Cleanup Freerouting log outpus # Cleanup Freerouting log outpus
if [ -e freerouting/freerouting.log ]; then if [ -e freerouting/freerouting.log ]; then
@ -44,7 +45,7 @@ do
# xvfb-run -a java -Dlog4j.configurationFile=file:./freerouting/log4j2.xml -jar freerouting/freerouting-1.7.0.jar -de ergogen/output/pcbs/${board}.dsn -do ergogen/output/pcbs/${board}.ses -dr freerouting/freerouting.rules -mp 20 # xvfb-run -a java -Dlog4j.configurationFile=file:./freerouting/log4j2.xml -jar freerouting/freerouting-1.8.0.jar -de ergogen/output/pcbs/${board}.dsn -do ergogen/output/pcbs/${board}.ses -dr freerouting/freerouting.rules -mp 20 -dct 1 # xvfb-run -a java -Dlog4j.configurationFile=file:./freerouting/log4j2.xml -jar freerouting/freerouting-1.7.0.jar -de ergogen/output/pcbs/${board}.dsn -do ergogen/output/pcbs/${board}.ses -dr freerouting/freerouting.rules -mp 20 # xvfb-run -a java -Dlog4j.configurationFile=file:./freerouting/log4j2.xml -jar freerouting/freerouting-1.8.0.jar -de ergogen/output/pcbs/${board}.dsn -do ergogen/output/pcbs/${board}.ses -dr freerouting/freerouting.rules -mp 20 -dct 1
# xvfb-run -a java -Dlog4j.configurationFile=file:./freerouting/log4j2.xml -jar freerouting/freerouting-1.9.0.jar -de ergogen/output/pcbs/${board}.dsn -do ergogen/output/pcbs/${board}.ses -dr freerouting/freerouting.rules -mp 20 -dct 1 # xvfb-run -a java -Dlog4j.configurationFile=file:./freerouting/log4j2.xml -jar freerouting/freerouting-1.9.0.jar -de ergogen/output/pcbs/${board}.dsn -do ergogen/output/pcbs/${board}.ses -dr freerouting/freerouting.rules -mp 20 -dct 1
# xvfb-run -a java -Dlog4j.configurationFile=file:./freerouting/log4j2.xml -jar freerouting/freerouting-test.jar -de ergogen/output/pcbs/${board}.dsn -do ergogen/output/pcbs/${board}.ses -dr freerouting/freerouting.rules -mp 20 -dct 1 # xvfb-run -a java -Dlog4j.configurationFile=file:./freerouting/log4j2.xml -jar freerouting/freerouting-test.jar -de ergogen/output/pcbs/${board}.dsn -do ergogen/output/pcbs/${board}.ses -dr freerouting/freerouting.rules -mp 20 -dct 1
${container_cmd} run ${container_args} soundmonster/freerouting_cli:v0.1.0 java -Dlog4j.configurationFile=file:./freerouting/log4j2.xml -jar /opt/freerouting_cli.jar -de ergogen/output/pcbs/${board}.dsn -do ergogen/output/pcbs/${board}.ses -dr freerouting/freerouting.rules -mp 20 ${container_cmd} run ${container_args} ${freerouting_cli_image} java -Dlog4j.configurationFile=file:./freerouting/log4j2.xml -jar /opt/freerouting_cli.jar -de ergogen/output/pcbs/${board}.dsn -do ergogen/output/pcbs/${board}.ses -dr freerouting/freerouting.rules -mp 20
# ${container_cmd} run ${container_args} nixos/nix nix-shell --argstr board ${board} # ${container_cmd} run ${container_args} nixos/nix nix-shell --argstr board ${board}
fi fi
if [ -e ergogen/output/pcbs/${board}.ses ]; then if [ -e ergogen/output/pcbs/${board}.ses ]; then
@ -60,4 +61,4 @@ done
# Docker runs as root and causes issues with file ownership # Docker runs as root and causes issues with file ownership
sudo chown $USER -R ergogen sudo chown $USER -R ergogen
sudo chown $USER -R freerouting sudo chown $USER -R freerouting