-
Notifications
You must be signed in to change notification settings - Fork 10
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.
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
App for Nixpkgs backports #38
Comments
For |
I think for now it would be easiest to just add the tightly-scoped GitHub app, it doesn't take much to make use of it: NixOS/nixpkgs#360260 |
I am ok either way. Can we have mergify as well? It has commands to rebase/squash pull requests and also the |
I'd rather have everyone use Mergify (or GH merge trains) since we now can actually reliably (and quickly!) report on eval status. I don't think we should add Mergify to Nixpkgs until we decide how to handle that. |
@winterqt what do you want to know about mergify? There is no much magic needed to use it. I can prepare a simple configuration. The big advantage of mergify over github merge queues is that, it allows to specify rules in a configuration file, so we don't need admin rights every time we add a new check. The other advantage is that the merge action can be triggered with labels, which allows for automerging backports for example. |
I'm saying that that's sort of a large enough change that we'd need to communicate to all committers -- I'd rather not have some people using it and some not. |
Well. Before we make it mandatory, we should evaluate it in a smaller group. If the alternative is not using merge queues, there is no downside if some testers are using it. We also need this feature for merge-bot. |
New issue: #39 |
I'm going to block figuring this out on an SC discussion, just since that's the most relevant regulatory body we have at the moment. |
Can the SC allocate some nixpkgs owners? As an org owner, I could approve both the GitHub App and Mergify to unblock the team. But since there is no nixpkgs team, who decides which path to take is unclear. On a personal level, outsourcing the merge queue seems better. It's one less thing to maintain and also ties us less to GitHub. |
Done. We'll follow up on the Mergify stuff soon. |
With this done, NixOS/nixpkgs#360260 is now ready :) |
…branches This will allow GitHub to run actions on those commits, specifically Eval action. Currently as these merges are commited by `github-actions`, Eval doesn't run on the commits. ie, https://github.com/NixOS/nixpkgs/actions/runs/12646467735/job/35237397411?pr=371701 failed due to NixOS@fa2d66f commit was done by github-actions. With this every periodic merge will be authored and commited by the nix-backports bot. We can reuse the bot here as they have similar perms (NixOS/org#38)
… branches This will allow GitHub to run actions on those commits, specifically Eval action. Currently as these merges are commited by `github-actions`, Eval doesn't run on the commits. ie, https://github.com/NixOS/nixpkgs/actions/runs/12646467735/job/35237397411?pr=371701 failed due to NixOS@fa2d66f commit was done by github-actions. With this every periodic merge will be authored and commited by the nix-backports bot. We can reuse the bot here as they have similar perms (NixOS/org#38) Signed-off-by: John Titor <[email protected]>
…branches This will allow GitHub to run actions on those commits, specifically Eval action. Currently as these merges are commited by `github-actions`, Eval doesn't run on the commits. ie, https://github.com/NixOS/nixpkgs/actions/runs/12646467735/job/35237397411?pr=371701 failed due to NixOS@fa2d66f commit was done by github-actions. With this every periodic merge will be authored and commited by the nix-backports bot. We can reuse the bot here as they have similar perms (NixOS/org#38) Signed-off-by: John Titor <[email protected]>
CI currently doesn't get triggered for the automated Nixpkgs backports, e.g. see NixOS/nixpkgs#360258. This happens because the PR is created by the default GitHub Actions bot account, which has some built-in infinite recursion prevention measures.
We can fix this by using a separate GitHub App bot account instead. This is a dependency for NixOS/nixpkgs#360260.
Instructions for @NixOS/org:
BACKPORT_APP_ID
BACKPORT_PRIVATE_KEY
The text was updated successfully, but these errors were encountered: