Skip to content
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

Allow commiters to merge any PR after CI is green #95

Open
Atemu opened this issue Jun 6, 2024 · 9 comments
Open

Allow commiters to merge any PR after CI is green #95

Atemu opened this issue Jun 6, 2024 · 9 comments

Comments

@Atemu
Copy link
Member

Atemu commented Jun 6, 2024

I sometimes have the case where I approve a PR but would like to wait for CI checks to be green before actually merging. What happens then is that I leave the tab open and return to it some time later but that can sometimes be weeks or even months when it should have been merged after an hour or so.

Would this be in scope for the merge bot?

@Mic92
Copy link
Member

Mic92 commented Jun 7, 2024

Would be a nice feature indeed. This or merge queues.

@JohnRTitor
Copy link

+1 for the merge queue, I believe we have a similar thing in Nixos-hardware already.

I try to "approve PRs" before merging, so I could get back after CI passes green. But sometimes PRs fall through the cracks despite being approved by a commiter.

@felschr
Copy link
Member

felschr commented Jun 24, 2024

A while ago I attempted to implement this functionality in nixpkgs using GitHub actions: NixOS/nixpkgs#261800

Unfortunately I got stuck, but maybe this can give some insights for a new implementation in nixpkgs-merge-bot.

@Scriptkiddi
Copy link
Collaborator

So apparently our docs need to be better. Currently if you use the merge bot it waits for all checks to pass and then merges the pr.

It only skips Darwin tests because the ci for that is sometimes broken

@Atemu
Copy link
Member Author

Atemu commented Jun 26, 2024

Oh, and it works on any PR?

@Mic92
Copy link
Member

Mic92 commented Jun 26, 2024

I think, it does by-name checks. But we can probably remove this restrictions for committers.

@JohnRTitor
Copy link

It does by-name checks and checks whether the invoking person is listed as the maintainer of the package. But currently if CI is not green, it errors out, providing no merge queue functionality.

@Atemu
Copy link
Member Author

Atemu commented Jun 26, 2024

It does by-name checks and checks whether the invoking person is listed as the maintainer of the package.

Disabling those two checks if the invoker is a committer is basically the core of this feature request.

But currently if CI is not green, it errors out, providing no merge queue functionality.

That would/should be expected behaviour.

@Mic92
Copy link
Member

Mic92 commented Jun 26, 2024

It probably needs a proper database at this point. On the other side, can we not just add mergify to nixpkgs` as well?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

5 participants