rulesets/nixpkgs: disallow squash/rebase merges on development branches #155
Conversation
With the introduction of Merge Queues, the only merge method on those branches will be "merge" as configured for the Merge Queue. By disallowing the other merge methods on development branches without merge queue, we achieve consistency without relying on contributor documentation. Resolves NixOS#135
| "bypass_actors": [ | ||
| { | ||
| "actor_id": 203427, | ||
| "actor_type": "Team", | ||
| "bypass_mode": "always" | ||
| }, | ||
| { | ||
| "actor_id": 1075715, | ||
| "actor_type": "Integration", | ||
| "bypass_mode": "always" | ||
| } | ||
| ], |
There was a problem hiding this comment.
Committers and nixpkgs-ci are bypassers here. Not for the merge methods, but for the "require pull request" part, we still need to be allowed to push to branches for the periodic merges.
While this will allow bypassing a PR entirely, it will not allow to use any other buttons than "merge". Squash and Rebase are gone, I tested that.
Note that PRs are still required for master/release branches via require-pull-request-except-release-team.json.
|
Could someone re-run CI here? The references check is slightly annoying. |
|
I can see on the NixOS Infra Alerts matrix channel that the Wiki does in fact appear to be going up and down. |
|
I tried implementing this, but it doesn't work. I'm not sure what I did differently while testing it in my fork, but I think I must have made a mistake while testing. I can't find a combination of "allowing pushes" and "forcing merge methods in the UI". This could only be implemented once pushes are forbidden. But once that's the case, we'd enable a Merge Queue for these branches anyway, so this becomes implied. Nothing we can do here, I think :/ |
3 participants
With the introduction of Merge Queues, the only merge method on those branches will be "merge" as configured for the Merge Queue. By disallowing the other merge methods on development branches without merge queue, we achieve consistency without relying on contributor documentation.
Resolves #135