ci: add mergify rules for nixpkgs #360340
Merged
Conversation
This file contains 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
github-actions
bot
added
10.rebuild-darwin: 0
JohnRTitor
changed the title
JohnRTitor
reviewed
Dec 1, 2024
JohnRTitor
reviewed
Dec 1, 2024
JohnRTitor
reviewed
Dec 1, 2024
This comment was marked as spam.
This comment was marked as spam.
JohnRTitor
approved these changes
Dec 3, 2024
|
Question: Let's say an workflow only runs on certain paths, like #361447 (on |
wegank
added
the
12.approvals: 1
|
Let's deploy it for now. We can always push a bugfix later, if we need any changes. |
|
I think we would actually mergify installed for this to work. Doesn't think this is the case just now: NixOS/org#39 |
|
Mergify is now active on the repo |
|
Thanks. Looks like merge queues need to be enabled separately. |
|
@Mic92 Enabled now |
13 tasks
|
I just had @Lassulus disable this as it was opening a Pull request per minute https://github.com/NixOS/nixpkgs/pulls?q=is%3Apr+is%3Aclosed+author%3Amergify%5Bbot%5D |
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.
Things done
Context: NixOS/org#38
We already deployed mergify in nixos-hardware: NixOS/nixos-hardware#1249 and in nix https://github.com/NixOS/nix/blob/master/.mergify.yml
This pull requests adds support for it in nixpkgs. Mergify adds support for declarative merge queues to nixpkgs. Merge queues make sure that pull request are tested against the latest base branch. The advantage over github's own merge queues is that, the configuration is part of the repository and therefore does not require a repository admin to keep "Required Checks" in sync with recently added CI checks.
Another advantage mergify has it's that it is a github app. There are many cases where github won't run checks on automated created pull requests. With mergify this is not an issue. If we are happy with the workflow introduced mergify, we can proceed adding it to
CONTRIBUTING.md.We have a similar feature in merge-bot. However it doesn't work very reliable. With mergify, we can later make
merge-botjust add a label remove the complicated code and database integration we have just now.nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.