From ec5786695e8cf3be640c66c670878738ae56fa5b Mon Sep 17 00:00:00 2001 From: David Holdeman Date: Thu, 21 Oct 2021 18:42:06 -0500 Subject: [PATCH] Use SSH for Pinouts (#3388) * switch to ssh * ssh env vars --- .github/workflows/gen-pinouts.yaml | 6 +++--- misc/actions/pinouts-install.sh | 2 +- misc/jenkins/generate_pinouts/gen_upload_pinouts.sh | 5 ++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/gen-pinouts.yaml b/.github/workflows/gen-pinouts.yaml index 599b6d70ad..792b79f88e 100644 --- a/.github/workflows/gen-pinouts.yaml +++ b/.github/workflows/gen-pinouts.yaml @@ -26,9 +26,9 @@ jobs: ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true' run: | if [ "${{github.ref}}" = "refs/heads/master" ]; then - echo "::set-env name=RUSEFI_FTP_SERVER::${{secrets.RUSEFI_FTP_SERVER}}"; - echo "::set-env name=RUSEFI_DOXYGEN_FTP_USER::${{secrets.RUSEFI_DOXYGEN_FTP_USER}}"; - echo "::set-env name=RUSEFI_DOXYGEN_FTP_PASS::${{secrets.RUSEFI_DOXYGEN_FTP_PASS}}"; + echo "::set-env name=RUSEFI_SSH_SERVER::${{secrets.RUSEFI_SSH_SERVER}}"; + echo "::set-env name=RUSEFI_DOXYGEN_SSH_USER::${{secrets.RUSEFI_DOXYGEN_SSH_USER}}"; + echo "::set-env name=RUSEFI_DOXYGEN_SSH_PASS::${{secrets.RUSEFI_DOXYGEN_SSH_PASS}}"; fi - name: Generate documentation diff --git a/misc/actions/pinouts-install.sh b/misc/actions/pinouts-install.sh index ba63b42785..294b421c78 100755 --- a/misc/actions/pinouts-install.sh +++ b/misc/actions/pinouts-install.sh @@ -1,7 +1,7 @@ #!/bin/bash sudo apt-get update - sudo apt-get install ncftp + sudo apt-get install sshpass wget https://github.com/mikefarah/yq/releases/download/v4.9.6/yq_linux_amd64 chmod a+x yq_linux_amd64 rm -rf yqdir diff --git a/misc/jenkins/generate_pinouts/gen_upload_pinouts.sh b/misc/jenkins/generate_pinouts/gen_upload_pinouts.sh index 85058c2414..89f363b7d7 100644 --- a/misc/jenkins/generate_pinouts/gen_upload_pinouts.sh +++ b/misc/jenkins/generate_pinouts/gen_upload_pinouts.sh @@ -2,10 +2,9 @@ misc/actions/pinouts-create.sh -if [ -n "$RUSEFI_FTP_SERVER" ]; then +if [ -n "$RUSEFI_SSH_SERVER" ]; then echo "Uploading Pinouts..." - ncftpput -r 999 -m -R -z -v -u "$RUSEFI_DOXYGEN_FTP_USER" -p "$RUSEFI_DOXYGEN_FTP_PASS" "$RUSEFI_FTP_SERVER" / pinouts - echo "Uploaded!" + tar -czf - pinouts | sshpass -p "$RUSEFI_DOXYGEN_SSH_PASS" ssh -o StrictHostKeyChecking=no "$RUSEFI_DOXYGEN_SSH_USER"@"$RUSEFI_SSH_SERVER" "tar -xzf -" fi [ $? -eq 0 ] || { echo "upload FAILED"; exit 1; }