From 6ce5d3d1155deb35b6680c5f4856e6d4fbc537ca Mon Sep 17 00:00:00 2001 From: Vladimir Litvinchik Date: Thu, 5 Sep 2024 10:55:07 +0300 Subject: [PATCH] Fixed caching issue with docs publication --- .github/workflows/publish-prod.yml | 17 +++++++++-------- .github/workflows/publish-qa.yml | 18 ++++++++++-------- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/.github/workflows/publish-prod.yml b/.github/workflows/publish-prod.yml index 5b0cc74..3d90093 100644 --- a/.github/workflows/publish-prod.yml +++ b/.github/workflows/publish-prod.yml @@ -8,8 +8,6 @@ on: branches: - master workflow_dispatch: - branches: - - master jobs: @@ -33,6 +31,7 @@ jobs: - name: Run and build Hugo run: | + rm -rf common/content/${{ env.PRODUCT }} mkdir -p common/content/${{ env.PRODUCT }} cp -r java common/content/${{ env.PRODUCT }} cp -r net common/content/${{ env.PRODUCT }} @@ -49,10 +48,12 @@ jobs: key: ${{ secrets.DOCS_SSH_KEY }} - name: Deploy documentation - uses: nogsantos/scp-deploy@master + uses: burnett01/rsync-deployments@7.0.1 with: - src: common/public/${{ env.PRODUCT }} - host: ${{ secrets.DOCS_SSH_HOST }} - remote: ${{ secrets.DOCS_SSH_DIR }} - user: ${{ secrets.DOCS_SSH_USER }} - key: ${{ secrets.DOCS_SSH_KEY }} + switches: -vzr --delete + path: common/public/${{ env.PRODUCT }} + remote_path: ${{ secrets.DOCS_SSH_DIR }} + remote_host: ${{ secrets.DOCS_SSH_HOST }} + remote_user: ${{ secrets.DOCS_SSH_USER }} + remote_key: ${{ secrets.DOCS_SSH_KEY }} + diff --git a/.github/workflows/publish-qa.yml b/.github/workflows/publish-qa.yml index 83a98cb..f324008 100644 --- a/.github/workflows/publish-qa.yml +++ b/.github/workflows/publish-qa.yml @@ -13,7 +13,7 @@ jobs: PRODUCT: total steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Submodule update run: | @@ -27,6 +27,7 @@ jobs: - name: Run and build Hugo run: | + rm -rf common/content/${{ env.PRODUCT }} mkdir -p common/content/${{ env.PRODUCT }} cp -r java common/content/${{ env.PRODUCT }} cp -r net common/content/${{ env.PRODUCT }} @@ -41,12 +42,13 @@ jobs: remote: ${{ secrets.DOCS_QA_SSH_DIR }}/sitemaps/${{ env.PRODUCT }}.xml user: ${{ secrets.DOCS_SSH_USER }} key: ${{ secrets.DOCS_SSH_KEY }} - + - name: Deploy documentation - uses: nogsantos/scp-deploy@master + uses: burnett01/rsync-deployments@7.0.1 with: - src: common/public/${{ env.PRODUCT }} - host: ${{ secrets.DOCS_SSH_HOST }} - remote: ${{ secrets.DOCS_QA_SSH_DIR }} - user: ${{ secrets.DOCS_SSH_USER }} - key: ${{ secrets.DOCS_SSH_KEY }} + switches: -vzr --delete + path: common/public/${{ env.PRODUCT }} + remote_path: ${{ secrets.DOCS_QA_SSH_DIR }} + remote_host: ${{ secrets.DOCS_SSH_HOST }} + remote_user: ${{ secrets.DOCS_SSH_USER }} + remote_key: ${{ secrets.DOCS_SSH_KEY }}