From f719f2fff0482108e86d67673033919a367b7ca4 Mon Sep 17 00:00:00 2001 From: Jagan Parthiban Date: Thu, 15 Feb 2024 19:51:14 +0530 Subject: [PATCH 1/6] Update gh actions to publish gh-page branch - testing --- .github/workflows/docs.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 3fcb4184ea..9eafc86f68 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -52,3 +52,11 @@ jobs: with: name: HTMLDocumentation path: docs/build/html/ + - name: Deploy to GitHub Pages + uses: peaceiris/actions-gh-pages@v3 + if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/test-tc-gh-page' }} + with: + publish_branch: gh-pages + github_token: ${{ secrets.GITHUB_TOKEN }} + publish_dir: _build/ + force_orphan: true From e14b86a1f5fd6dca998c5209e27b365222179eff Mon Sep 17 00:00:00 2001 From: Jagan Parthiban Date: Fri, 16 Feb 2024 11:04:26 +0530 Subject: [PATCH 2/6] Update gh actions to publish gh-page branch - testing --- .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 9eafc86f68..2e70df200e 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -52,7 +52,7 @@ jobs: with: name: HTMLDocumentation path: docs/build/html/ - - name: Deploy to GitHub Pages + - name: Deploy to GitHub Pages #Push to gh-pages branch uses: peaceiris/actions-gh-pages@v3 if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/test-tc-gh-page' }} with: From 6a946e23dc6e29411ca9a33508b60d03d451c3de Mon Sep 17 00:00:00 2001 From: Jagan Parthiban Date: Fri, 16 Feb 2024 18:31:31 +0530 Subject: [PATCH 3/6] Update gh actions to publish gh-page branch - testing 3 --- .github/workflows/docs.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 2e70df200e..5caf7470d5 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -30,6 +30,9 @@ on: - .github/workflows/docs.yml - traffic_control/clients/python/**.py +permissions: + contents: write + jobs: documentation: if: github.event.pull_request.draft == false @@ -60,3 +63,4 @@ jobs: github_token: ${{ secrets.GITHUB_TOKEN }} publish_dir: _build/ force_orphan: true + From d2bc3fc5c5aa0a3ea9ad15947b7f0d4cd96abb24 Mon Sep 17 00:00:00 2001 From: Jagan Parthiban Date: Fri, 16 Feb 2024 18:39:40 +0530 Subject: [PATCH 4/6] Update gh actions to publish gh-page branch - testing 4 --- .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 5caf7470d5..9cadc297f4 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -55,7 +55,7 @@ jobs: with: name: HTMLDocumentation path: docs/build/html/ - - name: Deploy to GitHub Pages #Push to gh-pages branch + - name: Deploy to GitHub Pages #Push to gh-pages branch 1 uses: peaceiris/actions-gh-pages@v3 if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/test-tc-gh-page' }} with: From b74e252cd6f5d736785575d64ac13643c2686795 Mon Sep 17 00:00:00 2001 From: Jagan Parthiban Date: Fri, 16 Feb 2024 18:50:28 +0530 Subject: [PATCH 5/6] Update gh actions to publish gh-page branch - testing 5 --- .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 9cadc297f4..23995848fb 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -61,6 +61,7 @@ jobs: with: publish_branch: gh-pages github_token: ${{ secrets.GITHUB_TOKEN }} - publish_dir: _build/ + publish_dir: docs/build/html/ force_orphan: true + From 8a83152ec7bdb21003f7dabac4d39226f7b27053 Mon Sep 17 00:00:00 2001 From: Jagan Parthiban Date: Mon, 19 Feb 2024 10:04:11 +0530 Subject: [PATCH 6/6] Update gh actions to publish gh-page branch - testing 6 --- .github/workflows/docs.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 23995848fb..e7be0b651a 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -57,7 +57,11 @@ jobs: path: docs/build/html/ - name: Deploy to GitHub Pages #Push to gh-pages branch 1 uses: peaceiris/actions-gh-pages@v3 - if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/test-tc-gh-page' }} + if: ${{ + github.event_name == 'pull_request' && + github.event.action == 'closed' && + github.event.pull_request.merged == true && + github.event.pull_request.base.ref == 'master' }} with: publish_branch: gh-pages github_token: ${{ secrets.GITHUB_TOKEN }}