From 97a612e46f4b0efbfeb8275cdb8c80da9989df7c Mon Sep 17 00:00:00 2001 From: David Stansby Date: Tue, 13 Jun 2023 10:05:10 +0100 Subject: [PATCH 01/11] Add doc deployment job --- .github/workflows/docs.yml | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 50d37fe7..61655afd 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -6,7 +6,7 @@ on: - main jobs: - build-and-upload: + build-docs: name: Build & Upload Artifact runs-on: ubuntu-latest steps: @@ -33,3 +33,19 @@ jobs: with: name: docs path: docs/_build + + upload-docs: + name: Upload docs to GitHub pages + runs-on: ubuntu-latest + needs: build-docs + steps: + - uses: actions/download-artifact@v3 + with: + name: docs + + - name: Push to GitHub pages + uses: peaceiris/actions-gh-pages@v3 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + publish_dir: ./docs/_build/html + destination_dir: dev From e267ff7d5b3bd4cbee085f8b28dffb13d5b220c0 Mon Sep 17 00:00:00 2001 From: David Stansby Date: Tue, 13 Jun 2023 10:09:48 +0100 Subject: [PATCH 02/11] Add write permissions --- .github/workflows/docs.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 61655afd..0b2e0df0 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -38,6 +38,8 @@ jobs: name: Upload docs to GitHub pages runs-on: ubuntu-latest needs: build-docs + permissions: + contents: write steps: - uses: actions/download-artifact@v3 with: From 27baf5c8b5a1d72879a0315e48d88bd8775d5974 Mon Sep 17 00:00:00 2001 From: David Stansby Date: Tue, 13 Jun 2023 10:22:47 +0100 Subject: [PATCH 03/11] Move permissions to whole workflow --- .github/workflows/docs.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 0b2e0df0..d26c2df9 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -5,6 +5,9 @@ on: branches: - main +permissions: + contents: write + jobs: build-docs: name: Build & Upload Artifact @@ -38,8 +41,6 @@ jobs: name: Upload docs to GitHub pages runs-on: ubuntu-latest needs: build-docs - permissions: - contents: write steps: - uses: actions/download-artifact@v3 with: From 89ccadf5edee008a3b8a1b080b8c2971de017f51 Mon Sep 17 00:00:00 2001 From: David Stansby Date: Tue, 13 Jun 2023 10:54:32 +0100 Subject: [PATCH 04/11] Add checkout step --- .github/workflows/docs.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index d26c2df9..c2d469b1 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -42,10 +42,11 @@ jobs: runs-on: ubuntu-latest needs: build-docs steps: + + - uses: actions/checkout@v3 - uses: actions/download-artifact@v3 with: name: docs - - name: Push to GitHub pages uses: peaceiris/actions-gh-pages@v3 with: From 496aaa68770e9fe63f4212b72badc0a6ac9a3d8a Mon Sep 17 00:00:00 2001 From: David Stansby Date: Tue, 13 Jun 2023 11:00:22 +0100 Subject: [PATCH 05/11] Try a different branch --- .github/workflows/docs.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index c2d469b1..33d16a87 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -53,3 +53,4 @@ jobs: github_token: ${{ secrets.GITHUB_TOKEN }} publish_dir: ./docs/_build/html destination_dir: dev + publish_branch: gh-pages-test From e42012a609f332b8b7bdcf7ee614fd2e1aa4652e Mon Sep 17 00:00:00 2001 From: David Stansby Date: Thu, 15 Jun 2023 10:34:09 +0100 Subject: [PATCH 06/11] Try a different action --- .github/workflows/docs.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 33d16a87..af2d2a3d 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -47,10 +47,7 @@ jobs: - uses: actions/download-artifact@v3 with: name: docs - - name: Push to GitHub pages - uses: peaceiris/actions-gh-pages@v3 + - name: Deploy to GitHub Pages + uses: JamesIves/github-pages-deploy-action@v4.4.2 with: - github_token: ${{ secrets.GITHUB_TOKEN }} - publish_dir: ./docs/_build/html - destination_dir: dev - publish_branch: gh-pages-test + folder: docs/_build/html From 499b6fff2ba9270721b8971d767775720ae172ac Mon Sep 17 00:00:00 2001 From: David Stansby Date: Thu, 15 Jun 2023 10:41:48 +0100 Subject: [PATCH 07/11] Fix folder? --- .github/workflows/docs.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index af2d2a3d..116cc5c9 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -47,7 +47,8 @@ jobs: - uses: actions/download-artifact@v3 with: name: docs + - run: ls - name: Deploy to GitHub Pages uses: JamesIves/github-pages-deploy-action@v4.4.2 with: - folder: docs/_build/html + folder: html From 4dc47774b638fa9712a7e05dac519e64d7adc7dc Mon Sep 17 00:00:00 2001 From: David Stansby Date: Thu, 15 Jun 2023 10:45:36 +0100 Subject: [PATCH 08/11] Remove debug stage --- .github/workflows/docs.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 116cc5c9..6fd13d40 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -47,7 +47,6 @@ jobs: - uses: actions/download-artifact@v3 with: name: docs - - run: ls - name: Deploy to GitHub Pages uses: JamesIves/github-pages-deploy-action@v4.4.2 with: From 74915e0f7cdcd8d1000b39d7ac413f693b3d343d Mon Sep 17 00:00:00 2001 From: David Stansby Date: Thu, 15 Jun 2023 10:51:43 +0100 Subject: [PATCH 09/11] Try using a deploy key --- .github/workflows/docs.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 6fd13d40..be3189b9 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -51,3 +51,4 @@ jobs: uses: JamesIves/github-pages-deploy-action@v4.4.2 with: folder: html + ssh-key: ${{ secrets.DEPLOY_KEY }} From 61791c4fc130ce4add2f23bb808957284af976a4 Mon Sep 17 00:00:00 2001 From: David Stansby Date: Thu, 15 Jun 2023 11:18:15 +0100 Subject: [PATCH 10/11] Try different repo --- .github/workflows/docs.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index be3189b9..af713182 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -52,3 +52,4 @@ jobs: with: folder: html ssh-key: ${{ secrets.DEPLOY_KEY }} + repository-name: dstansby/napari-matplotlib.github.io From 94f02b2afb4c1efc59cbcfe06f985181d8b7d86b Mon Sep 17 00:00:00 2001 From: David Stansby Date: Thu, 15 Jun 2023 11:25:12 +0100 Subject: [PATCH 11/11] Try a PAT --- .github/workflows/docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index af713182..633aaaa8 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -51,5 +51,5 @@ jobs: uses: JamesIves/github-pages-deploy-action@v4.4.2 with: folder: html - ssh-key: ${{ secrets.DEPLOY_KEY }} + token: ${{ secrets.DOC_PAT }} repository-name: dstansby/napari-matplotlib.github.io