👷 Refactor CI artifact upload/download for docs previews (#5793)

diff --git a/.github/workflows/build-docs.yml b/.github/workflows/build-docs.yml
index 3052ec1e2bb3cc3279823cbd8bb1df4c4e4717ab..3bf986274210224f85cbd977ffe565ed0e5653e4 100644 (file)
--- a/.github/workflows/build-docs.yml
+++ b/.github/workflows/build-docs.yml
@@ -36,7 +36,7 @@ jobs:
       - uses: actions/upload-artifact@v3
         with:
           name: docs-zip
-          path: ./docs.zip
+          path: ./site/docs.zip
       - name: Deploy to Netlify
         uses: nwtgck/actions-netlify@v1.2.4
         with:

diff --git a/.github/workflows/preview-docs.yml b/.github/workflows/preview-docs.yml
index a2e5976fba50a2ee16d3bff556499ece7eb41b2a..bb3e9ebf64dcf310a11e6dd9fe78602ab0c438dd 100644 (file)
--- a/.github/workflows/preview-docs.yml
+++ b/.github/workflows/preview-docs.yml
@@ -11,6 +11,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+      - name: Clean site
+        run: |
+          rm -rf ./site
+          mkdir ./site
       - name: Download Artifact Docs
         uses: dawidd6/action-download-artifact@v2.24.2
         with:
@@ -18,9 +22,10 @@ jobs:
           workflow: build-docs.yml
           run_id: ${{ github.event.workflow_run.id }}
           name: docs-zip
+          path: ./site/
       - name: Unzip docs
         run: |
-          rm -rf ./site
+          cd ./site
           unzip docs.zip
           rm -f docs.zip
       - name: Deploy to Netlify

diff --git a/scripts/zip-docs.sh b/scripts/zip-docs.sh
index f2b7ba3be3078285644f5962ca7312b056ee2ec2..69315f5ddd7df7342635bf1df206efed7fe20501 100644 (file)
--- a/scripts/zip-docs.sh
+++ b/scripts/zip-docs.sh
@@ -3,7 +3,9 @@
 set -x
 set -e
 
+cd ./site
+
 if [ -f docs.zip ]; then
     rm -rf docs.zip
 fi
-zip -r docs.zip ./site
+zip -r docs.zip ./