ci: rebase before pushing release/pre-release commits#1109
Merged
Conversation
github-actions
Bot
added
the
t-tooling
Why: Both release.yaml and pre_release.yaml push the changelog/version bump to master via EndBug/add-and-commit. If anything else lands on master between checkout and push, the push is rejected with `cannot lock ref` — non-fast-forward, even when the service-account bypass succeeds. Adding `pull: '--rebase --autostash'` lets EndBug rebase onto the new tip first.
B4nan
force-pushed
the
ci/release-rebase-on-push
branch
from
a31f42d to
102a743
Compare
vladfrangu
approved these changes
Apr 29, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Add
pull: '--rebase --autostash'to theEndBug/add-and-commitstep in theupdate_changelogjobs of bothrelease.yamlandpre_release.yaml, so the changelog/version commits survive a concurrent ref update on master.Context
Same race that bit
apify/apify-client-jsin run 25114327598: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.yamlis especially exposed since it's triggered on every push to master.🤖 Generated with Claude Code