From 793d75d9ba3c6d7c2457d514fa691fe3ab9cd1f9 Mon Sep 17 00:00:00 2001 From: Julius Busecke Date: Thu, 17 Oct 2024 14:25:13 -0400 Subject: [PATCH 1/5] Potential follow up fix for #125 --- .github/workflows/deploy-book.yaml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/deploy-book.yaml b/.github/workflows/deploy-book.yaml index 9520980..4864aeb 100644 --- a/.github/workflows/deploy-book.yaml +++ b/.github/workflows/deploy-book.yaml @@ -64,22 +64,22 @@ jobs: if: | (github.ref == 'refs/heads/main' && inputs.cname == 'None') with: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - BRANCH: gh-pages - FOLDER: ${{ inputs.publish_dir }} - CLEAN: true - KEEP_HISTORY: false - BASE_PATH: ${{ inputs.destination_dir }} + token: ${{ secrets.GITHUB_TOKEN }} + branch: gh-pages + folder: ${{ inputs.publish_dir }} + clean: true + clean-exclude: "preview" # keep existing previews from other PRs + target-folder: ${{ inputs.destination_dir }} - name: Deploy to GitHub Pages with custom domain uses: JamesIves/github-pages-deploy-action@v4 if: | (github.ref == 'refs/heads/main' && inputs.cname != 'None') with: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - BRANCH: gh-pages - FOLDER: ${{ inputs.publish_dir }} - CLEAN: true - KEEP_HISTORY: false - BASE_PATH: ${{ inputs.destination_dir }} - CNAME: ${{ inputs.cname }} + token: ${{ secrets.GITHUB_TOKEN }} + branch: gh-pages + folder: ${{ inputs.publish_dir }} + clean: true + clean-exclude: "preview" # keep existing previews from other PRs + target-folder: ${{ inputs.destination_dir }} + CNAME: ${{ inputs.cname }} # how can we set this for the new action? From 5d315ae146d5d50e7540c9d0fd995c89293bf2b4 Mon Sep 17 00:00:00 2001 From: Julius Busecke Date: Fri, 18 Oct 2024 09:09:54 -0400 Subject: [PATCH 2/5] Add checkout to deploy workflow --- .github/workflows/deploy-book.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/deploy-book.yaml b/.github/workflows/deploy-book.yaml index 4864aeb..7f90397 100644 --- a/.github/workflows/deploy-book.yaml +++ b/.github/workflows/deploy-book.yaml @@ -59,6 +59,8 @@ jobs: unzip book.zip rm -f book.zip + - uses: actions/checkout@v4 + - name: Deploy to GitHub Pages uses: JamesIves/github-pages-deploy-action@v4 if: | From 7d02834c994c391a4c77e4d64f675c7887ac870a Mon Sep 17 00:00:00 2001 From: Julius Busecke Date: Fri, 18 Oct 2024 09:13:45 -0400 Subject: [PATCH 3/5] Update deploy-book.yaml --- .github/workflows/deploy-book.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/deploy-book.yaml b/.github/workflows/deploy-book.yaml index 7f90397..5dc60da 100644 --- a/.github/workflows/deploy-book.yaml +++ b/.github/workflows/deploy-book.yaml @@ -61,6 +61,12 @@ jobs: - uses: actions/checkout@v4 + - name: Debug + run: pwd + + - name: Debug + run: ls -la + - name: Deploy to GitHub Pages uses: JamesIves/github-pages-deploy-action@v4 if: | From e0348b9ddb5cc2bb754dbd82e7beaca143dbc567 Mon Sep 17 00:00:00 2001 From: Julius Busecke Date: Fri, 18 Oct 2024 09:17:10 -0400 Subject: [PATCH 4/5] Update deploy-book.yaml --- .github/workflows/deploy-book.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-book.yaml b/.github/workflows/deploy-book.yaml index 5dc60da..bc59de5 100644 --- a/.github/workflows/deploy-book.yaml +++ b/.github/workflows/deploy-book.yaml @@ -65,7 +65,7 @@ jobs: run: pwd - name: Debug - run: ls -la + run: ls -la book/_build/html - name: Deploy to GitHub Pages uses: JamesIves/github-pages-deploy-action@v4 From 1393c0f4c4852cb5c29b70f346f1cff24a5ca31c Mon Sep 17 00:00:00 2001 From: Julius Busecke Date: Fri, 18 Oct 2024 09:19:56 -0400 Subject: [PATCH 5/5] Update deploy-book.yaml --- .github/workflows/deploy-book.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy-book.yaml b/.github/workflows/deploy-book.yaml index bc59de5..49980ce 100644 --- a/.github/workflows/deploy-book.yaml +++ b/.github/workflows/deploy-book.yaml @@ -36,6 +36,8 @@ jobs: run: shell: bash -l {0} steps: + - uses: actions/checkout@v4 + - name: Download merged artifact if: inputs.is_preview != 'true' uses: actions/download-artifact@v4 @@ -59,8 +61,6 @@ jobs: unzip book.zip rm -f book.zip - - uses: actions/checkout@v4 - - name: Debug run: pwd