andreika-git
/
rusefi
mirror of https://github.com/andreika-git/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Try SSH instead of FTP (#2290) 

* try ssh

* oops

* fix path
This commit is contained in:
David Holdeman 2021-02-06 09:10:51 -06:00 committed by GitHub
parent 30358e0526
commit 6e217c92fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.github/workflows/gen-docs.yaml vendored
View File

@ -1,8 +1,10 @@
name: Generate documentation name: Generate documentation
on: on:
schedule: push:
- cron: '0 0 * * *' branches: master
# schedule:
# - cron: '0 0 * * *'
jobs: jobs:
generate: generate:
@ -14,13 +16,13 @@ jobs:
submodules: recursive submodules: recursive
fetch-depth: 0 fetch-depth: 0
- name: Install ncftp, kicad, doxygen, graphviz, and yq - name: Install prerequisite software
run: | run: |
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys CC86BB64 sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys CC86BB64
sudo add-apt-repository ppa:rmescandon/yq sudo add-apt-repository ppa:rmescandon/yq
sudo add-apt-repository ppa:kicad/kicad-5.1-releases sudo add-apt-repository ppa:kicad/kicad-5.1-releases
sudo apt-get update 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 - name: Set FTP variables
env: env:

12
misc/jenkins/generate_doxygen/gen_upload_docs.sh
View File

@ -7,7 +7,9 @@ bash misc/jenkins/InteractiveHtmlBom/run.sh
if [ -n "$RUSEFI_FTP_SERVER" ]; then if [ -n "$RUSEFI_FTP_SERVER" ]; then
echo "Uploading IBOMs" 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 fi
pwd pwd
@ -20,7 +22,9 @@ doxygen || { echo "doxygen run FAILED"; exit 1; }
cd ../doxygen cd ../doxygen
if [ -n "$RUSEFI_FTP_SERVER" ]; then if [ -n "$RUSEFI_FTP_SERVER" ]; then
echo "Uploading Doxygen" 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 fi
[ $? -eq 0 ] || { echo "upload FAILED"; exit 1; } [ $? -eq 0 ] || { echo "upload FAILED"; exit 1; }
@ -48,6 +52,8 @@ done
if [ -n "$RUSEFI_FTP_SERVER" ]; then if [ -n "$RUSEFI_FTP_SERVER" ]; then
echo "Uploading Pinouts" 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 fi
[ $? -eq 0 ] || { echo "upload FAILED"; exit 1; } [ $? -eq 0 ] || { echo "upload FAILED"; exit 1; }