rusefi
/
custom-board-bundle-sample-fork-of-rusefi
mirror of https://github.com/rusefi/custom-board-bundle-sample-fork-of-rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

More Kicad Diff changes (#1694) 

* switch to lftp, fix path, and remove old

* add release flag

* remove release suffix

* wrong flag

* use my fork instead
This commit is contained in:
David Holdeman 2020-08-14 19:04:28 -05:00 committed by GitHub
parent 5cdfcc41d6
commit 755a3b5974
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/gen-diffs.yaml vendored
View File

@ -15,14 +15,14 @@ jobs:
submodules: recursive submodules: recursive
fetch-depth: 0 fetch-depth: 0
- name: Install ncftp, kicad, and tk bindings - name: Install lftp, kicad, and tk bindings
run: | run: |
sudo add-apt-repository ppa:js-reynaud/kicad-5.1 sudo add-apt-repository ppa:js-reynaud/kicad-5.1
sudo apt-get update sudo apt-get update
sudo apt-get install ncftp kicad python3-tk sudo apt-get install lftp kicad python3-tk
- name: Get KiCad-Diff - name: Get KiCad-Diff
run: git clone https://github.com/Gasman2014/KiCad-Diff.git run: git clone https://github.com/chuckwagoncomputing/KiCad-Diff.git
- name: Set FTP variables - name: Set FTP variables
run: | run: |

4
hardware/generate_diffs.sh
View File

@ -13,8 +13,8 @@
function gendiffs() { function gendiffs() {
../KiCad-Diff/kidiff_linux.py -w -s Git -b $(git rev-parse --short HEAD~1) -a $(git rev-parse --short HEAD) -d :0 $1 ../KiCad-Diff/kidiff_linux.py -w -s Git -b $(git rev-parse --short HEAD~1) -a $(git rev-parse --short HEAD) -d :0 $1
if [ -d $(dirname "$1")/plots ] && [ -n "$RUSEFI_FTP_SERVER" ]; then if [ -d $(dirname "$1")/plots ] && [ -n "$RUSEFI_FTP_SERVER" ]; then
echo "mkdir diffs/plots_$(basename "$1" .kicad_pcb)" | ncftp -u "$RUSEFI_DOXYGEN_FTP_USER" -p "$RUSEFI_DOXYGEN_FTP_PASS" "$RUSEFI_FTP_SERVER" lftp -u "$RUSEFI_DOXYGEN_FTP_USER","$RUSEFI_DOXYGEN_FTP_PASS" "$RUSEFI_FTP_SERVER" -e \
ncftpput -R -v -u "$RUSEFI_DOXYGEN_FTP_USER" -p "$RUSEFI_DOXYGEN_FTP_PASS" "$RUSEFI_FTP_SERVER" /diffs/plots_$(basename "$1" .kicad_pcb) $(dirname "$1")/plots "mirror -Re $(dirname "$1")/plots/ /diffs/plots_$(basename "$1" .kicad_pcb); exit"
fi fi
} }
export -f gendiffs export -f gendiffs