Repository navigation
Land formula and bottle commits on main through an approved PR - #15
Open
samyakLambda wants to merge 1 commit into
Open
samyakLambda wants to merge 1 commit into
samyakLambda wants to merge 1 commit into
Conversation
Since 2 Nov 2026 the org's "PR required" ruleset covers this tap's main: one approval, the approver is not the last pusher, no bypass. Both release workflows pushed straight to main, so the next release would stop at the tap. scripts/merge-via-pr.sh replaces those pushes. It pushes HEAD to chore/rook-<version>[-bottles]-run-<run id>-<attempt>, opens a PR, prints the link, and merges it once a maintainer approves (or notices a hand merge). It closes an earlier run's open PR for the same prefix, refuses to land if main moved since checkout (as the non-fast-forward push did), and gives up after 5h30m inside the jobs' new 6-hour timeout, leaving the PR open with the next step to run by hand. scripts/test-merge-via-pr.sh runs it end to end against a bare remote and scripts/fixtures/fake-gh; test-version-order.mjs's competing-push case now goes through it. MAINTAINING.md describes the approval step. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
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
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.
Since 2 Nov 2026 this tap's
mainis under the org's "PR required" ruleset: one approval, the approver can't be the last pusher, and nobody can bypass it.update-formula.ymlandbuild-bottles.ymlboth pushed straight tomain, so the next CLI release would stop at the tap.What changes
scripts/merge-via-pr.shreplaces both pushes:chore/rook-<version>[-bottles]-run-<run id>-<attempt>.mainthat moved after checkout, as the old non-fast-forward push refused to. It closes the PR and fails instead.MAINTAINING.mddescribes the approval step. Each release now has two PRs to approve: the formula, then the bottle block. The bot is the last pusher, so whoever cut the release can approve both.No new secrets: the repo already lets
GITHUB_TOKENopen and merge PRs, and the workflows addpull-requests: write.Tests
scripts/test-merge-via-pr.sh(new): runs the real script end to end against a bare remote, withscripts/fixtures/fake-ghstanding in forgh pr. 26 checks: approved, hand-merged, closed, timeout, merge refused,mainmoved, and a superseded earlier run.maincheck, the superseded close, the head-commit pin, or the branch cleanup turns the harness red.test-version-order.mjs: the competing-push case now runs through the PR path.actionlintis clean.APPROVEDunder the org ruleset; if it doesn't, a hand merge still completes the runRelated
The private release pipeline's Homebrew step gives up after 5 minutes. A separate private PR makes it end green once the formula PR is open and waiting. Until that ships, a release run goes red at that step even though the tap PR is fine to approve.
🤖 Generated with Claude Code