mirror of https://github.com/rusefi/rusefi.git
Upgrade to Kicad 7 (#5178)
* update to kicad 7 * update rusefi_lib * update InteractiveHtmlBom * use my branch for now
This commit is contained in:
parent
37b97cc1db
commit
cfce02f151
|
@ -21,12 +21,12 @@ jobs:
|
||||||
- name: Install sshpass, kicad, and tk bindings
|
- name: Install sshpass, kicad, and tk bindings
|
||||||
run: |
|
run: |
|
||||||
sudo bash misc/actions/add-ubuntu-latest-apt-mirrors.sh
|
sudo bash misc/actions/add-ubuntu-latest-apt-mirrors.sh
|
||||||
sudo add-apt-repository --yes ppa:kicad/kicad-6.0-releases
|
sudo add-apt-repository --yes ppa:kicad/kicad-7.0-releases
|
||||||
sudo apt-get install sshpass kicad python3-pip python3-tk scour librsvg2-bin
|
sudo apt-get install sshpass kicad python3-pip python3-tk scour librsvg2-bin
|
||||||
pip install python-dateutil pygubu
|
pip install python-dateutil pygubu
|
||||||
|
|
||||||
- name: Get KiCad-Diff
|
- name: Get KiCad-Diff
|
||||||
run: git clone https://github.com/leoheck/KiCad-Diff.git
|
run: git clone -b exit-nicely https://github.com/chuckwagoncomputing/KiCad-Diff.git
|
||||||
|
|
||||||
- name: Set SSH variables
|
- name: Set SSH variables
|
||||||
env:
|
env:
|
||||||
|
|
|
@ -3,6 +3,7 @@ name: Generate Interactive BOMs
|
||||||
on:
|
on:
|
||||||
schedule:
|
schedule:
|
||||||
- cron: '0 0 * * *'
|
- cron: '0 0 * * *'
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
generate:
|
generate:
|
||||||
|
@ -18,6 +19,7 @@ jobs:
|
||||||
- name: Install prerequisite software
|
- name: Install prerequisite software
|
||||||
run: |
|
run: |
|
||||||
sudo bash misc/actions/add-ubuntu-latest-apt-mirrors.sh
|
sudo bash misc/actions/add-ubuntu-latest-apt-mirrors.sh
|
||||||
|
sudo add-apt-repository --yes ppa:kicad/kicad-7.0-releases
|
||||||
sudo apt-get install kicad sshpass
|
sudo apt-get install kicad sshpass
|
||||||
|
|
||||||
- name: Set SSH variables
|
- name: Set SSH variables
|
||||||
|
|
|
@ -23,6 +23,7 @@ err.txt
|
||||||
log.txt
|
log.txt
|
||||||
*.rusefi_binary
|
*.rusefi_binary
|
||||||
*.msq
|
*.msq
|
||||||
|
*.kicad_prl
|
||||||
|
|
||||||
# Eclipse
|
# Eclipse
|
||||||
.metadata/
|
.metadata/
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit f447335471eef988353253b52fb4cc409a6f4d73
|
Subproject commit c444135ba2fcab8e8dd4af5a25d8d068d8f9eb69
|
|
@ -1 +1 @@
|
||||||
Subproject commit bb139482308d6d41c7682669ebdf1563fd54c0bd
|
Subproject commit 6f95125ede0cd79ac943646ba923cc5db0515922
|
|
@ -1,16 +1,17 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
INTERACTIVE_HTML_BOM_NO_DISPLAY="true"
|
INTERACTIVE_HTML_BOM_NO_DISPLAY="true"
|
||||||
IBOM_CMD="python3 hardware/InteractiveHtmlBom/InteractiveHtmlBom/generate_interactive_bom.py --no-browser --name-format \"%f_latest\" --dest-dir ../ibom --include-nets"
|
ibom() {
|
||||||
echo "IBOM_CMD=$IBOM_CMD"
|
python3 hardware/InteractiveHtmlBom/InteractiveHtmlBom/generate_interactive_bom.py --no-browser --name-format "%f_latest" --dest-dir ../ibom --include-nets $@
|
||||||
|
}
|
||||||
|
|
||||||
pwd
|
echo "Current directory: $(pwd)"
|
||||||
[ -e hardware/frankenso/frankenso.kicad_pcb ] || { echo "hardware/frankenso/frankenso.kicad_pcb not found. Was this invoked from wrong folder?"; exit -1; }
|
[ $(basename $(pwd)) = 'rusefi' ] || { echo "Not in 'rusefi' directory. Was this invoked from the wrong directory?"; exit 1; }
|
||||||
|
|
||||||
for f in $(ls hardware/*/*.kicad_pcb); do
|
for f in $(ls hardware/*/*.kicad_pcb); do
|
||||||
if ls $(dirname $f)/$(basename $f .kicad_pcb).net 2>/dev/null; then
|
if ls $(dirname $f)/$(basename $f .kicad_pcb).net 2>/dev/null; then
|
||||||
$IBOM_CMD --netlist-file $(ls $(dirname $f)/$(basename $f .kicad_pcb).net) $f
|
ibom --netlist-file $(ls $(dirname $f)/$(basename $f .kicad_pcb).net) $f
|
||||||
else
|
else
|
||||||
$IBOM_CMD $f
|
ibom $f
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
echo "Should be executed from project root folder. Will try to upload to $RUSEFI_FTP_SERVER"
|
echo "Should be executed from project root folder. Will try to upload to $RUSEFI_SSH_SERVER"
|
||||||
pwd
|
pwd
|
||||||
# ibom is part of Doxygen job simply in order to reduce workspace HDD usage on my tiny build server
|
# ibom is part of Doxygen job simply in order to reduce workspace HDD usage on my tiny build server
|
||||||
bash misc/jenkins/InteractiveHtmlBom/run.sh
|
bash misc/jenkins/InteractiveHtmlBom/run.sh
|
||||||
|
|
Loading…
Reference in New Issue