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

Support for Github Merge Queues? #107

Closed
tnorling opened this issue Feb 15, 2023 · 8 comments
Closed

Support for Github Merge Queues? #107

tnorling opened this issue Feb 15, 2023 · 8 comments
Assignees
Labels
enhancement New feature or request

Comments

@tnorling
Copy link

Github recently added a new feature for merging pull requests called Merge Queues. Unfortunately, when we tried to turn this on the CLA workflow doesn't appear to get triggered when a pull request gets added to the merge queue which prevents the PR from being merged (required check). I'm wondering if this is on your radar to support this new feature or if you have any suggestions for getting this to run?

@markphip
Copy link

We are watching this discussion: https://github.com/orgs/community/discussions/46757#discussioncomment-4934834

It looks like a problem in the feature affecting all GitHub Apps that add PR checks.

@logdog16
Copy link

Hey there @markphip! Has there been any updates/progress on this? Our team would really like to enable Merge Queues as we've got issues around merge velocity during heavy traffic days, however our org's CLA requirement is the last remaining roadblock.

@markphip
Copy link

Have you tried it again? GitHub has made the feature GA and it seems like there are teams using it so I assume they resolved the issues around GitHub apps

@logdog16
Copy link

logdog16 commented Sep 19, 2023

I spent a few hours fiddling with our repo settings today, but I keep getting blocked by the CLA requirement. Once the PR enters the merge queue, I can see all my other pipelines transition from the expected (no status reported yet) -> queued (pipeline reports it's started/in-progress) state within about 60 seconds and get a details button that takes me to the pipeline. The CLA requirement, however, never exits the expected state or reports success/failure/in-progress.

image

@markphip
Copy link

Thanks for the followup. We think we see the change that needs to be made now. We will let you know when the change has been tested and released so you can try again.

The difference with the other teams that have been successfully using the feature is that our checks are not required in their repositories. We have to update our code to be able to post back the status update on a queued request so that a required check can pass.

@logdog16
Copy link

Thank you very much for the explanation as to why this is occurring, and for agreeing to make it work for our scenario! I'll keep watching this thread, and give Merge Queues another go in our repo once there's an update.

Thank you again!

@JohannesLampel
Copy link
Contributor

Merge queues are now supported by CLA. In order to make use of the new functionality, the updated permissions request from the microsoft-github-policy-service or dotnet-policy-service has to be accepted by the respective org admins before the functionality becomes available.
For the microsoft org, the request has already been accepted and merge queues are working there as expected.

@logdog16
Copy link

logdog16 commented Oct 4, 2023

Merge queues are now supported by CLA.

Huge thank you to your team for quickly fixing this issue! I was able to give merge queues another go in our repo last night, and after the latest changes to the CLA task, I can confirm we're no longer blocked and that the CLA task is firing and reporting success in merge queue builds as expected.

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

No branches or pull requests

5 participants
@markphip @tnorling @logdog16 @JohannesLampel and others