Skip to content

rulesets/nixpkgs: disallow squash/rebase merges on development branches #155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wolfgangwalther wants to merge 1 commit into from
Closed

rulesets/nixpkgs: disallow squash/rebase merges on development branches #155

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 41 additions & 0 deletions rulesets/nixpkgs/require-merge-method.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{
"name": "require-merge-method",
"target": "branch",
"source_type": "Repository",
"source": "NixOS/nixpkgs",
"enforcement": "active",
"conditions": {
"ref_name": {
"exclude": [],
"include": [
"~DEFAULT_BRANCH",
"refs/heads/release*",
"refs/heads/staging*",
"refs/heads/haskell-updates"
]
}
},
"rules": [
{
"type": "pull_request",
"parameters": {
"allowed_merge_methods": [
"merge"
]
}
}
],
"bypass_actors": [
{
"actor_id": 203427,
"actor_type": "Team",
"bypass_mode": "always"
},
{
"actor_id": 1075715,
"actor_type": "Integration",
"bypass_mode": "always"
}
],
Comment on lines +28 to +39
Copy link
Contributor Author

@wolfgangwalther wolfgangwalther Aug 31, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

"current_user_can_bypass": "always"
}