Repository navigation
rulesets: require up-to-date branches on the CI-enforced repos - #267
Merged
Merged
Conversation
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info
📝 Summary
Merge Risk: ⚪ Minimal · up to
|
| Check name | Status | Explanation |
|---|---|---|
| Title check |  |
The title is specific, imperative, 62 characters, and accurately describes requiring up-to-date branches on the CI-enforced repositories. |
| Description check | |
The description directly explains the ruleset change, affected repositories, rationale, expected plan, validation, and linked issue. |
| Linked Issues check | |
Issue #266 option 2 requires strict status-check freshness for .github, betula, claytonia, drosera, and kalmia, while other repositories remain unchanged. terraform/locals.tf defines exact… |
| Out of Scope Changes check | |
The diff changes only the repository set in terraform/locals.tf and the matching ruleset policy in terraform/rulesets.tf. Both changes directly implement issue #266 option 2. No unrelated change i… |
| Docstring Coverage | |
No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check. Docstring coverage is scoped to functions touched by this diff. Analyzed 0 functions across 0… |
✨ Finishing Touches
-
🧪 Generate unit tests (beta)
-
- Commit to this branch
- Create a new PR
-
- Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts
Comment @coderabbitai help to get the list of available commands.
Contributor
terraform plan (success) |
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.
Summary
lentago/claytonia#22 asked that a merge be blocked while the PR branch is behind
main, the enforcement half of its "rebase before merge" item. That is the branch ruleset's strict required-status-checks policy, which every fleetmainruleset had set tofalse: a stale branch merged as soon as its own checks were green, which is how fleet PR #19 in claytonia went CONFLICTING and was redone as #20 on 2026-06-19.Of the options weighed in #266, this takes the second: strict on only where a stale merge applies stale state. The five repos whose CI applies
mainto a live surface on every merge (.github, betula, claytonia, drosera, kalmia) now require a PR to include the currentmainbefore it can merge; a plan computed against an oldmaincan no longer be the one that runs. Content and site repos keep the practice recorded in claytonia#144 instead (workers open PRs current withmain; the merger updates a BEHIND PR before arming), because there a stale merge costs a conflict, not a wrong apply.Mechanically: a new
strict_up_to_date_reposset inlocals.tf, and the ruleset'sstrict_required_status_checks_policyreads membership in it. The rule only exists alongside required contexts, and all five have them inrequired-checks.json. Expected plan: fivegithub_repository_ruleset.mainupdates in place, nothing else.What changes for people and bots on those five repos: a PR that falls behind
mainmust be updated (gh pr update-branch) and re-checked before auto-merge fires, and Dependabot's grouped PRs will need@dependabot rebasemore often, as two of them did in today's sweep.gh pr merge --autostill arms as before.Validation:
terraform fmt -checkandterraform validate(no backend) pass locally; the plan runs on this PR.Closes #266
🤖 Generated with Claude Code