Repository navigation
ruleset-sync: an @consumers extra for the merge bot (MIP-0086 row 3) - #109
Merged
Merged
Conversation
…5.7) The "@Consumers" key in bypass-extras.json merges into the expected ruleset of every repo in .github/consumers.txt (--consumers FILE) before that repo's own extras. marola's extra moves there, so marola-merge-bot gets a pull_request-only bypass on every consumer and nowhere else. Tested: ruleset-sync.sh --self-test red then green; devkit quality gate Co-Authored-By: Claude <[email protected]>
…ent @Consumers Tested: ruleset-sync.sh --self-test (new case red with extras_of's order reversed, green as written); devkit quality gate Co-Authored-By: Claude <[email protected]>
Closes #100 Tested: devkit quality gate Co-Authored-By: Claude <[email protected]>
brunogbv
added a commit
that referenced
this pull request
Oct 13, 2026
Resolve the CHANGELOG and docs/4-reference_tools.md conflicts with #109: keep both v0.9.0 bullets, and main's ruleset-sync row followed by this branch's merge-key-check row. Tested: devkit quality gate (outside Nix) on the merge result Co-Authored-By: Claude <[email protected]>
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:
ruleset-synclearns an@consumerskey inbypass-extras.json, applied to every repo in.github/consumers.txtbefore that repo's own extras. The merge bot (marola-merge-bot, App 5257042) moves there from marola's own entry, so it becomes a pull-request-only bypass actor on every devkit consumer and on nothing else. Closes #100.ruleset-sync.sh --self-testred (unknown--consumers) then green; devkit quality gate run outside Nix (ruff 0.17.0 from a venv), so CI's run is the one that countsWhat changed
scripts/ruleset-sync.sh:--consumers FILE(default.github/consumers.txt),extras_ofmerges@consumersfirst and the repo's own extras last, so a repo's own mode for the same actor wins. Self-tests: a consumer gets the extra, a consumer without it reads as drift andapplyadds it, a non-consumer never gets it, a consumer's own entry outranks@consumers..github/rulesets/bypass-extras.json: marola's entry for 5257042 becomes the@consumersentry. marola keeps it because it is a consumer.docs/4-reference_tools.md: theruleset-syncrow mentions@consumersand--consumers.CHANGELOG.md: one line in the unreleased v0.9.0 entry.Before anyone runs
apply(the second half of row 3, a person's step after v0.9.0 is out):applyis all or nothing per repo, and on five consumers it changes more than the merge bot.ruleset-sync checkover the consumers with this branch reports, for marola-app, marola-site, marola-ml, marola-corpus and marola-oods: the missing 5257042 actor, and OrganizationAdmin plus RepositoryRole 5 live asalwayswhere the manifest sayspull_request.main's script reports the same admin drift, so it predates this PR: v0.8.2 (#74) set the rule andrulesets-applynever reached these five. Applying ends direct admin pushes tomainin those repos. Approve that knowingly.Run
applyfrom a devkit checkout atmainor at v0.9.0. A consumer or the umbrella still pinned to v0.8.3 would apply the old extras file and strip 5257042 from the five again.Read-only results with this branch, 2026-10-12:
This branch and
mip-0086/2-bot-tokenboth add a line to the v0.9.0 CHANGELOG entry; whichever merges second rebases.