Merge branch 'master' into feat/python-builder

input-output-hk · Mar 25, 2024 · 10addc4 · 10addc4
2 parents c070b45 + 45d46f1
commit 10addc4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/.github/workflows/branch-pages-delete.yml b/.github/workflows/branch-pages-delete.yml
@@ -71,6 +71,11 @@ jobs:
         run: |
           echo "Clean up for branch ${{ env.GIT_BRANCH }} at ${{ env.DEST_DIR_DOCS }} and ${{ env.DEST_DIR_TESTS }}"
 
+      - name: Get current published documentation
+        uses: actions/checkout@v3
+        with:
+          ref: gh-pages
+
       - name: Remove branches draft docs and test reports
         run: |
           rm -rf ${{ env.DEST_DIR_DOCS }}

diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml
@@ -65,14 +65,18 @@ jobs:
           GIT_BRANCH=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}
           if [[ $GIT_BRANCH == "${{ github.event.repository.default_branch }}" ]]; then
             DEST_DIR="/"
-            CLEAN_EXCLUDE="/branch/*\n/allure-action/*"
+            {
+            echo 'CLEAN_EXCLUDE<<EOF'
+            echo "/branch/*"
+            echo "/allure-action/*"
+            echo EOF
+            } >> "$GITHUB_ENV"
           else
             DEST_DIR="/branch/${GIT_BRANCH//[^a-zA-Z0-9_]/_}"
-            CLEAN_EXCLUDE="/nothing"
+            echo "CLEAN_EXCLUDE="/nothing"" >> $GITHUB_ENV
           fi
           echo "GIT_BRANCH=$GIT_BRANCH" >> $GITHUB_ENV
           echo "DEST_DIR=$DEST_DIR" >> $GITHUB_ENV
-          echo "CLEAN_EXCLUDE=$CLEAN_EXCLUDE" >> $GITHUB_ENV
       - name: Setup CI
         uses: input-output-hk/catalyst-ci/actions/setup@master
         with: