diff --git a/.github/workflows/gen-docs.yaml b/.github/workflows/gen-docs.yaml index 6c6cb7d581..6a3b2a89b5 100644 --- a/.github/workflows/gen-docs.yaml +++ b/.github/workflows/gen-docs.yaml @@ -24,8 +24,8 @@ jobs: run: | if [ "${{github.ref}}" = "refs/heads/master" ]; then 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}}"; + echo "::set-env name=RUSEFI_SSH_USER::${{secrets.RUSEFI_SSH_USER}}"; + echo "::set-env name=RUSEFI_SSH_PASS::${{secrets.RUSEFI_SSH_PASS}}"; fi - name: Generate documentation diff --git a/.github/workflows/gen-pinouts.yaml b/.github/workflows/gen-pinouts.yaml index 792b79f88e..658f2c351c 100644 --- a/.github/workflows/gen-pinouts.yaml +++ b/.github/workflows/gen-pinouts.yaml @@ -27,8 +27,8 @@ jobs: run: | if [ "${{github.ref}}" = "refs/heads/master" ]; then 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}}"; + echo "::set-env name=RUSEFI_SSH_USER::${{secrets.RUSEFI_SSH_USER}}"; + echo "::set-env name=RUSEFI_SSH_PASS::${{secrets.RUSEFI_SSH_PASS}}"; fi - name: Generate documentation diff --git a/misc/jenkins/generate_doxygen/gen_upload_docs.sh b/misc/jenkins/generate_doxygen/gen_upload_docs.sh index 213fe2d580..1db90027a9 100644 --- a/misc/jenkins/generate_doxygen/gen_upload_docs.sh +++ b/misc/jenkins/generate_doxygen/gen_upload_docs.sh @@ -9,6 +9,6 @@ doxygen || { echo "doxygen run FAILED"; exit 1; } cd ../doxygen if [ -n "$RUSEFI_SSH_SERVER" ]; then echo "Uploading Doxygen" - tar -czf - html | sshpass -p "$RUSEFI_DOXYGEN_SSH_PASS" ssh -o StrictHostKeyChecking=no "$RUSEFI_DOXYGEN_SSH_USER"@"$RUSEFI_SSH_SERVER" "tar -xzf -" + tar -czf - html | sshpass -p "$RUSEFI_SSH_PASS" ssh -o StrictHostKeyChecking=no "$RUSEFI_SSH_USER"@"$RUSEFI_SSH_SERVER" "tar -xzf - -C docs" fi [ $? -eq 0 ] || { echo "upload FAILED"; exit 1; } diff --git a/misc/jenkins/generate_pinouts/gen_upload_pinouts.sh b/misc/jenkins/generate_pinouts/gen_upload_pinouts.sh index 89f363b7d7..2334d6fdd8 100644 --- a/misc/jenkins/generate_pinouts/gen_upload_pinouts.sh +++ b/misc/jenkins/generate_pinouts/gen_upload_pinouts.sh @@ -4,7 +4,7 @@ misc/actions/pinouts-create.sh if [ -n "$RUSEFI_SSH_SERVER" ]; then echo "Uploading Pinouts..." - tar -czf - pinouts | sshpass -p "$RUSEFI_DOXYGEN_SSH_PASS" ssh -o StrictHostKeyChecking=no "$RUSEFI_DOXYGEN_SSH_USER"@"$RUSEFI_SSH_SERVER" "tar -xzf -" + tar -czf - pinouts | sshpass -p "$RUSEFI_SSH_PASS" ssh -o StrictHostKeyChecking=no "$RUSEFI_SSH_USER"@"$RUSEFI_SSH_SERVER" "tar -xzf - -C docs" fi [ $? -eq 0 ] || { echo "upload FAILED"; exit 1; }