diff --git a/.github/workflows/gen-diffs.yaml b/.github/workflows/gen-diffs.yaml index 9611b342d6..a9b41cc748 100644 --- a/.github/workflows/gen-diffs.yaml +++ b/.github/workflows/gen-diffs.yaml @@ -15,14 +15,14 @@ jobs: submodules: recursive fetch-depth: 0 - - name: Install ncftp, kicad, and tk bindings + - name: Install lftp, kicad, and tk bindings run: | sudo add-apt-repository ppa:js-reynaud/kicad-5.1 sudo apt-get update - sudo apt-get install ncftp kicad python3-tk + sudo apt-get install lftp kicad python3-tk - 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 run: | diff --git a/hardware/generate_diffs.sh b/hardware/generate_diffs.sh index f68ec279e1..b1d463b654 100644 --- a/hardware/generate_diffs.sh +++ b/hardware/generate_diffs.sh @@ -13,8 +13,8 @@ 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 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" - 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 + lftp -u "$RUSEFI_DOXYGEN_FTP_USER","$RUSEFI_DOXYGEN_FTP_PASS" "$RUSEFI_FTP_SERVER" -e \ + "mirror -Re $(dirname "$1")/plots/ /diffs/plots_$(basename "$1" .kicad_pcb); exit" fi } export -f gendiffs