Skip to content

Commit 731bd2b

Browse files
committed
docs workflow: try to fix it a third time
I think I likely found the issue. zizmor seems OK with persisting credentials, see https://github.com/jj-vcs/jj/actions/runs/13559693565/job/37900455060?pr=5820 Both of these workflows run only on commits in `main`, so this doesn't seem like a huge security hole, but we could consider other, better solutions in the future. Follow up to 78177ff. See #5819 for a failed attempt. cc @thoughtpolice @neongreen @martinvonz
1 parent 78177ff commit 731bd2b

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

.github/workflows/docs.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ jobs:
2020
steps:
2121
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
2222
with:
23-
persist-credentials: false
23+
# `.github/scripts/docs-build-deploy` will need to `git push` to the docs branch
24+
persist-credentials: true
2425
- run: "git fetch origin gh-pages --depth=1"
2526
- uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38
2627
with:
@@ -36,7 +37,5 @@ jobs:
3637
export MKDOCS_SITE_NAME="Jujutsu docs (prerelease)"
3738
export MKDOCS_PRIMARY_COLOR="blue grey"
3839
.github/scripts/docs-build-deploy prerelease --push
39-
env:
40-
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4140
- name: "Show `git diff --stat`"
4241
run: git diff --stat gh-pages^ gh-pages || echo "(No diffs)"

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,8 @@ jobs:
128128
steps:
129129
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
130130
with:
131-
persist-credentials: false
131+
# `.github/scripts/docs-build-deploy` will need to `git push` to the docs branch
132+
persist-credentials: true
132133
- run: "git fetch origin gh-pages --depth=1"
133134
- uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38
134135
with:
@@ -146,6 +147,5 @@ jobs:
146147
.github/scripts/docs-build-deploy "${RELEASE_TAG_NAME}" latest --update-aliases --push
147148
env:
148149
RELEASE_TAG_NAME: ${{ github.event.release.tag_name }}
149-
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
150150
- name: "Show `git diff --stat`"
151151
run: git diff --stat gh-pages^ gh-pages || echo "(No diffs)"

0 commit comments

Comments
 (0)