Skip to content

Commit 812f2ea

Browse files
authored
ci: rebase before pushing the docs theme update commit (#883)
## Summary Add `pull: '--rebase --autostash'` to the `EndBug/add-and-commit` step in `manual_release_docs.yaml` so the docs-theme commit survives a concurrent ref update on the default branch. ## Context Same race that bit `apify/apify-client-js` in [run 25114327598](https://github.com/apify/apify-client-js/actions/runs/25114327598/job/73597522121): ``` remote rejected (cannot lock ref 'refs/heads/master': is at <new> but expected <old>) ``` The bypass logs `remote: Bypassed rule violations for refs/heads/master` — so it's not permissions, it's just non-fast-forward because something landed on master between checkout and push. The sibling `manual_version_docs.yaml` already uses `pull: '--rebase --autostash'`; this aligns `manual_release_docs.yaml` with it. 🤖 Generated with [Claude Code](https://claude.com/claude-code)
1 parent c522b1a commit 812f2ea

1 file changed

Lines changed: 1 addition & 0 deletions

File tree

.github/workflows/manual_release_docs.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ jobs:
6969
add: website/package.json website/pnpm-lock.yaml
7070
message: "chore: Automatic docs theme update [skip ci]"
7171
default_author: github_actions
72+
pull: '--rebase --autostash'
7273
# `actions/checkout` detaches HEAD on SHA refs; EndBug needs a branch to push.
7374
new_branch: ${{ github.event.repository.default_branch }}
7475

0 commit comments

Comments
 (0)