rulesets/nixpkgs: add merge queue for lints on master #149
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| { | ||
| "name": "require-merge-queue", | ||
| "target": "branch", | ||
| "source_type": "Repository", | ||
| "source": "NixOS/nixpkgs", | ||
| "enforcement": "active", | ||
| "conditions": { | ||
| "ref_name": { | ||
| "exclude": [], | ||
| "include": [ | ||
| "~DEFAULT_BRANCH" | ||
| ] | ||
| } | ||
| }, | ||
| "rules": [ | ||
| { | ||
| "type": "merge_queue", | ||
| "parameters": { | ||
| "merge_method": "MERGE", | ||
| "max_entries_to_build": 5, | ||
| "min_entries_to_merge": 1, | ||
| "max_entries_to_merge": 5, | ||
| "min_entries_to_merge_wait_minutes": 5, | ||
| "grouping_strategy": "ALLGREEN", | ||
| "check_response_timeout_minutes": 60 | ||
|
Member
There was a problem hiding this comment. Maybe check if these numbers make sense for Nixpkgs, or try them out and adjust as necessary (can do it more ad-hoc, commit later)
Contributor
Author
There was a problem hiding this comment. Yeah, no experience, so left the default here. We should certainly look into this once we have a bit more experience. |
||
| } | ||
| } | ||
| ], | ||
| "bypass_actors": [ | ||
| { | ||
| "actor_id": 203427, | ||
wolfgangwalther marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| "actor_type": "Team", | ||
| "bypass_mode": "pull_request" | ||
| } | ||
| ] | ||
| } | ||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just for the record: we will never* be able to add wildcard branches to the include/exclude lists for this ruleset, as GitHub currently doesn't support requiring Merge Queues on a ruleset with wildcard patterns.
All listed branches must either be the default branch, or a non-wildcard pattern.
This means we can't add
refs/heads/release-*and would instead have to add (e.g.)refs/heads/release-25.05.*At least, until GitHub adds support.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, that might not be too bad, though. In the current release process, the release team needs to push directly to the release branch anyway, so the merge queue would require them to do that differently. There could be a step in the release process to have the merge queue enabled for the new branch, explicitly.