rulesets/nixpkgs: enable merge queue on secondary development branches #183
Conversation
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
3 tasks
MattSturgeon
approved these changes
Oct 12, 2025
This enables Merge Queues on secondary development branches like staging and haskell-updates as well. These branches still need to be pushed to manually for the periodic merges, both automated by CI and manually by committers. Compared to the ruleset for merge queues on the primary development branches, this `always` allows bypassing. Since the number of merges on these branches is much lower, an occasional bypassing of the queue for the periodic merges is not a problem, at least resource-wise. We will still want to eventually implement a PR-based workflow for periodic merges to make sure these never break the branch.
wolfgangwalther
force-pushed
the
nixpkgs-merge-queues
branch
from
8f31726 to
84b4994
Compare
Contributor
Author
|
Thanks for the quick look. This is already implemented, but merge is blocked because I fixed the |
K900
approved these changes
Oct 12, 2025
infinisil
approved these changes
Oct 14, 2025
Contributor
Author
|
Thanks! |
zowoq
reviewed
Nov 8, 2025
| "include": [ | ||
| "refs/heads/haskell-updates", | ||
| "refs/heads/staging", | ||
| "refs/heads/staging-next", |
Contributor
There was a problem hiding this comment.
Should staging-nixos be added here?
Contributor
Author
There was a problem hiding this comment.
Yes. Could you open a PR?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
This enables Merge Queues on secondary development branches like staging and haskell-updates as well.
These branches still need to be pushed to manually for the periodic merges, both automated by CI and manually by committers. Compared to the ruleset for merge queues on the primary development branches, this
alwaysallows bypassing. Since the number of merges on these branches is much lower, an occasional bypassing of the queue for the periodic merges is not a problem, at least resource-wise.We will still want to eventually implement a PR-based workflow for periodic merges to make sure these never break the branch.
Although not the primary motivation, this will also resolve #135.
cc @NixOS/nixpkgs-ci