From 739641966fa180a0716053d66b14b3451ea700b6 Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Tue, 2 May 2023 09:15:46 -0500 Subject: [PATCH] Use rsync-antora-reference@v0.0.1 --- .github/actions/publish-docs.sh | 43 ------------------------------- .github/workflows/deploy-docs.yml | 7 ++++- 2 files changed, 6 insertions(+), 44 deletions(-) delete mode 100755 .github/actions/publish-docs.sh diff --git a/.github/actions/publish-docs.sh b/.github/actions/publish-docs.sh deleted file mode 100755 index 0d133daca5..0000000000 --- a/.github/actions/publish-docs.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/bash - -FROM=build/site -HOST="$1" -HOST_PATH="$2" -SSH_PRIVATE_KEY="$3" -SSH_KNOWN_HOST="$4" -CLOUDFLARE_ZONE_ID="$5" -CLOUDFLARE_CACHE_TOKEN="$6" -SSH_PRIVATE_KEY_PATH="$HOME/.ssh/${GITHUB_REPOSITORY:-publish-docs}" - -if [ "$#" -ne 6 ]; then - echo -e "not enough arguments USAGE:\n\n$0 \$HOST \$HOST_PATH \$SSH_PRIVATE_KEY \$SSH_KNOWN_HOST \$CLOUDFLARE_ZONE_ID \$CLOUDFLARE_CACHE_TOKEN\n\n" >&2 - exit 1 -fi - -( - set -e - set -f - install -m 600 -D /dev/null "$SSH_PRIVATE_KEY_PATH" - echo "$SSH_PRIVATE_KEY" > "$SSH_PRIVATE_KEY_PATH" - echo "$SSH_KNOWN_HOST" > ~/.ssh/known_hosts - RSYNC_OPTS='-avz --delete' - if [ -f .full-build ]; then - unlink .full-build - BUILD_REFNAME= - fi - if [ -n "$BUILD_REFNAME" ]; then - RSYNC_OPTS="-c $RSYNC_OPTS$(find $FROM -mindepth 1 -maxdepth 1 \! -name 404.html \! -name '.*' -type f -printf ' --include /%P')" - RSYNC_OPTS="$RSYNC_OPTS$(find $FROM -mindepth 1 -maxdepth 1 -type d \! -name _ -printf ' --include /%P --include /%P/**') --exclude **" - fi - rsync $RSYNC_OPTS -e "ssh -i $SSH_PRIVATE_KEY_PATH" $FROM/ "$HOST:$HOST_PATH" - if [ -z "$BUILD_REFNAME" ]; then - curl -X POST "https://api.cloudflare.com/client/v4/zones/$CLOUDFLARE_ZONE_ID/purge_cache" \ - -H "Content-Type:application/json" -H "Authorization: Bearer $CLOUDFLARE_CACHE_TOKEN" \ - --data '{"files":["https://docs.spring.io/spring-security"]}' - fi -) -exit_code=$? - -rm -f "$SSH_PRIVATE_KEY_PATH" - -exit $exit_code diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml index 65fa942acd..183ebc8eb1 100644 --- a/.github/workflows/deploy-docs.yml +++ b/.github/workflows/deploy-docs.yml @@ -34,4 +34,9 @@ jobs: - name: Run Antora run: ./gradlew antora - name: Publish Docs - run: $GITHUB_WORKSPACE/.github/actions/publish-docs.sh "${{ secrets.DOCS_USERNAME }}@${{ secrets.DOCS_HOST }}" /opt/www/domains/spring.io/docs/htdocs/spring-security/reference/ "${{ secrets.DOCS_SSH_KEY }}" "${{ secrets.DOCS_SSH_HOST_KEY }}" "${{ secrets.CLOUDFLARE_ZONE_ID }}" "${{ secrets.CLOUDFLARE_CACHE_TOKEN }}" + uses: spring-io/spring-doc-actions/rsync-antora-reference@v0.0.1 + with: + docs-username: ${{ secrets.DOCS_USERNAME }} + docs-host: ${{ secrets.DOCS_HOST }} + docs-ssh-key: ${{ secrets.DOCS_SSH_KEY }} + docs-ssh-host-key: ${{ secrets.DOCS_SSH_HOST_KEY }}