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

Add Merge Queue Support To workflows #225

Closed
naphelps opened this issue Mar 20, 2024 · 2 comments
Closed

Add Merge Queue Support To workflows #225

naphelps opened this issue Mar 20, 2024 · 2 comments
Assignees
Labels
bug Something isn't working enhancement New feature or request

Comments

@naphelps
Copy link
Member

With the sometimes high volume of PRs that are created and merged we run into the problem of having to either ask individual authors/contributors to step-wise update rebase their PRs as they are merged, or a maintainer has to rebase the PR themselves causing the commit signing to become unverified. Merge queue can help with this problem, but the existing workflows need to be updated to support the queues.

The DCO bot does not currently support merge queues and a dummy workflow has to be used to force the check to pass. PRs are required to pass the DCO check prior to being added to the queue. dcoapp/app#199

@naphelps naphelps added bug Something isn't working enhancement New feature or request labels Mar 20, 2024
@naphelps naphelps self-assigned this Mar 20, 2024
@cipherboy
Copy link
Member

Hmm @naphelps I'm confused why we're requiring PRs to be rebased prior to merge? Unless as a maintainer you manually push the branch to main, clicking the rebase and merge button on the GH UI will never give a GPG signed commit and thus will always be marked unverified (see link I sent a while back on Matrix). I don't think merge queues with rebasing will solve this either.

My 2c. but we could perhaps just merge without requiring up-to-date PRs unless we know there's dependencies between PRs we want to make sure are tested?

Rather, I think this is conflating two things: up to date for verification (won't work) and merge queues to handle volume. The latter is, on its own, a good idea, but won't solve the former.

@naphelps
Copy link
Member Author

naphelps commented Mar 20, 2024

@cipherboy Ah, thanks for clarifying. I am hoping it helps with PR merge volume and it also seems to automatically update the successive PRs in the queue as it merges along. Just a builtin benefit. Keeping the PRs up to date does try to left shift file conflicts and dependencies. It can also help if check failures have more than one contributing issue. Sure we merged in a fix in a different prior PR, but this one is still failing even with the fix from the prior merge. It has captured depend-bot update issues already.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working enhancement New feature or request
Projects
None yet
Development

No branches or pull requests

2 participants