ci: fast-forward main when the bump PR merge is refused - #201
Merged
Conversation
The ruleset bypass covers ref pushes but the PR merge API does not exercise it: the app merges bump PRs on go-sdk by direct push while the same app gets "base branch policy prohibits the merge" here (run 29761405739, PR #200). When the direct merge is refused, fast-forward main to the PR head via the refs API; GitHub marks the PR merged and the tag step proceeds at that SHA. Auto-merge stays armed and the recovery pre-check still backstops both.
alexh-kc
approved these changes
Jul 20, 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.
What
Third act of the bump saga. #194's direct merge deployed and ran, and GitHub refused it:
base branch policy prohibits the merge(run 29761405739, PR #200 sat open and 0.21.1 stalled).The evidence says the ruleset bypass (
keycard-gh-workflows-access, actor 2798702, bypassMode always, perkeycardlabs/infraPulumi) covers ref pushes but the PR merge API doesn't exercise it: the same app direct-pushes bump commits to go-sdk main, which the ruleset's pull_request rule would otherwise forbid, while its merge calls here get refused.So: when the direct merge is refused, fast-forward
refs/heads/mainto the PR head via the refs API (force=false, so it only succeeds when main hasn't moved). GitHub marks the PR merged and the existing tag step proceeds at that SHA. Auto-merge stays armed and the #194 recovery pre-check still backstops any remaining stall.Ordering of fallbacks per green-checks poll cycle (max 3): merge API → ref fast-forward → keep waiting.
Twin PR in typescript-sdk.
🤖 Generated with Claude Code