From 6e217c92fa578dd9c9d007cecfdbf42a621e9862 Mon Sep 17 00:00:00 2001
From: David Holdeman <david@chuckwagoncomputing.com>
Date: Sat, 6 Feb 2021 09:10:51 -0600
Subject: [PATCH] Try SSH instead of FTP (#2290)

* try ssh

* oops

* fix path
---
 .github/workflows/gen-docs.yaml                  | 10 ++++++----
 misc/jenkins/generate_doxygen/gen_upload_docs.sh | 12 +++++++++---
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/gen-docs.yaml b/.github/workflows/gen-docs.yaml
index ac0fdee457..271b858dce 100644
--- a/.github/workflows/gen-docs.yaml
+++ b/.github/workflows/gen-docs.yaml
@@ -1,8 +1,10 @@
 name: Generate documentation
 
 on:
-  schedule:
-    - cron: '0 0 * * *'
+  push:
+    branches: master
+#  schedule:
+#    - cron: '0 0 * * *'
 
 jobs:
   generate:
@@ -14,13 +16,13 @@ jobs:
         submodules: recursive
         fetch-depth: 0
 
-    - name: Install ncftp, kicad, doxygen, graphviz, and yq
+    - name: Install prerequisite software
       run: |
         sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys CC86BB64
         sudo add-apt-repository ppa:rmescandon/yq
         sudo add-apt-repository ppa:kicad/kicad-5.1-releases
         sudo apt-get update
-        sudo apt-get install ncftp kicad doxygen graphviz yq
+        sudo apt-get install ncftp kicad doxygen graphviz yq sshpass
 
     - name: Set FTP variables
       env:
diff --git a/misc/jenkins/generate_doxygen/gen_upload_docs.sh b/misc/jenkins/generate_doxygen/gen_upload_docs.sh
index 06fa1e8ef4..6fd322786c 100644
--- a/misc/jenkins/generate_doxygen/gen_upload_docs.sh
+++ b/misc/jenkins/generate_doxygen/gen_upload_docs.sh
@@ -7,7 +7,9 @@ bash misc/jenkins/InteractiveHtmlBom/run.sh
 
 if [ -n "$RUSEFI_FTP_SERVER" ]; then
   echo "Uploading IBOMs"
-  ncftpput -R -m -u "$RUSEFI_DOXYGEN_FTP_USER" -p "$RUSEFI_DOXYGEN_FTP_PASS" "$RUSEFI_FTP_SERVER" /ibom hardware/ibom/*
+  tar -cvzf - -C hardware ibom |\
+    sshpass -p $RUSEFI_DOXYGEN_FTP_PASS ssh -o StrictHostKeyChecking=no $RUSEFI_DOXYGEN_FTP_USER@$RUSEFI_FTP_SERVER \
+      "(tar -xzvf - -C ~)"
 fi
 
 pwd
@@ -20,7 +22,9 @@ doxygen || { echo "doxygen run FAILED"; exit 1; }
 cd ../doxygen
 if [ -n "$RUSEFI_FTP_SERVER" ]; then
   echo "Uploading Doxygen"
-  ncftpput -R -m -u "$RUSEFI_DOXYGEN_FTP_USER" -p "$RUSEFI_DOXYGEN_FTP_PASS" "$RUSEFI_FTP_SERVER" /html html/*
+  tar -cvzf - html |\
+    sshpass -p $RUSEFI_DOXYGEN_FTP_PASS ssh -o StrictHostKeyChecking=no $RUSEFI_DOXYGEN_FTP_USER@$RUSEFI_FTP_SERVER \
+      "(tar -xzvf - -C ~)"
 fi
 [ $? -eq 0 ] || { echo "upload FAILED"; exit 1; }
 
@@ -48,6 +52,8 @@ done
 
 if [ -n "$RUSEFI_FTP_SERVER" ]; then
   echo "Uploading Pinouts"
-  ncftpput -R -m -u "$RUSEFI_DOXYGEN_FTP_USER" -p "$RUSEFI_DOXYGEN_FTP_PASS" "$RUSEFI_FTP_SERVER" /pinouts pinouts/*
+  tar -cvzf - pinouts |\
+    sshpass -p $RUSEFI_DOXYGEN_FTP_PASS ssh -o StrictHostKeyChecking=no $RUSEFI_DOXYGEN_FTP_USER@$RUSEFI_FTP_SERVER \
+      "(tar -xzvf - -C ~)"
 fi
 [ $? -eq 0 ] || { echo "upload FAILED"; exit 1; }