Skip to content

Commit 66abc66

Browse files
authored
ci: rebase before pushing release/pre-release commits (#1109)
## Summary Add `pull: '--rebase --autostash'` to the `EndBug/add-and-commit` step in the `update_changelog` jobs of both `release.yaml` and `pre_release.yaml`, so the changelog/version commits survive a concurrent ref update on master. ## 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. `pre_release.yaml` is especially exposed since it's triggered on every push to master. 🤖 Generated with [Claude Code](https://claude.com/claude-code)
1 parent a100c1a commit 66abc66

2 files changed

Lines changed: 2 additions & 0 deletions

File tree

.github/workflows/pre_release.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ jobs:
9292
author_name: Apify Release Bot
9393
author_email: noreply@apify.com
9494
message: "chore(release): Update changelog and package version [skip ci]"
95+
pull: "--rebase --autostash"
9596

9697
- name: Get pre-release version
9798
id: get-pre-release-version

.github/workflows/release.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ jobs:
125125
author_name: Apify Release Bot
126126
author_email: noreply@apify.com
127127
message: "chore(release): Update changelog and package version [skip ci]"
128+
pull: "--rebase --autostash"
128129

129130
build-bundles:
130131
name: Build bundles

0 commit comments

Comments
 (0)