Skip to content

Commit 2660bd2

Browse files
committed
Fix preview/postmerge doc publishing conflict.
This removes the GHA to push to pages and instead just publishes the `gh-pages` branch to pages. It also changes our doc publishing to work by just publishing to that branch.
1 parent 29ef6f1 commit 2660bd2

2 files changed

Lines changed: 9 additions & 54 deletions

File tree

.github/workflows/publish_docs.yml

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ permissions:
1111
id-token: 'write'
1212

1313
jobs:
14-
build:
15-
name: "Build Docs"
14+
build-and-deploy:
15+
name: "Build and DeployDocs"
1616
runs-on: 'ubuntu-latest'
1717
steps:
1818
- uses: 'actions/checkout@v4'
@@ -21,18 +21,11 @@ jobs:
2121
with:
2222
src: 'docs'
2323
dst: 'generated-pages'
24-
- name: 'Upload artifact'
25-
uses: 'actions/upload-pages-artifact@v3'
24+
- name: 'Install rsync'
25+
run: 'apt-get update && apt-get install -y rsync'
26+
- name: 'Deploy Docs'
27+
uses: JamesIves/github-pages-deploy-action@v4
2628
with:
27-
path: 'generated-pages'
28-
deploy:
29-
name: "Deploy Docs"
30-
environment:
31-
name: 'github-pages'
32-
url: '${{ steps.deployment.outputs.page_url }}'
33-
runs-on: 'ubuntu-latest'
34-
needs: 'build'
35-
steps:
36-
- name: 'Deploy to GitHub Pages'
37-
id: 'deployment'
38-
uses: 'actions/deploy-pages@v4'
29+
folder: generated-pages
30+
force: false
31+
clean-exclude: pr-preview/

.github/workflows/publish_docs_preview_branch.yml

Lines changed: 0 additions & 38 deletions
This file was deleted.

0 commit comments

Comments
 (0)