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

feat: add support for merge queues in repository rulesets #2380

Merged
merged 6 commits into from
Feb 27, 2025

Conversation

MXfive
Copy link
Contributor

@MXfive MXfive commented Sep 6, 2024

Resolves #1481


Before the change?

  • Does not support merge queue rules on rulesets.

After the change?

  • Supports merge queue rules on rulesets

Pull request checklist

  • Tests for the changes have been added (for bug fixes / features)
  • Docs have been reviewed and added / updated if needed (for bug fixes / features)

Does this introduce a breaking change?

Please see our docs on breaking changes to help!

  • Yes
  • No

@MXfive
Copy link
Contributor Author

MXfive commented Sep 6, 2024

Waiting for SDK to be released before rebasing and putting for review. Wanted to get some early feedback on:

  1. The code, any issues or changes needed? Quite simple following the other code in that context, descriptions copy pasted from upstream API docs verbatim.
  2. Testing, I added the block to the only tests I found referencing these rules, though giving incomplete inputs to these blocks does not fail the tests.
    3. Not yet checked where to add docs, will have a look if I have time over the weekend.

@MXfive MXfive force-pushed the main branch 4 times, most recently from cb8ab58 to b5a3a69 Compare September 17, 2024 01:46
@MXfive MXfive marked this pull request as ready for review September 17, 2024 01:47
@MXfive MXfive changed the title feat: add support for merge queues in repository and organization rulesets feat: add support for merge queues in repository rulesets Oct 2, 2024
@zepeng811
Copy link
Contributor

@MXfive #2359 have been merged, can you help rebase your PR

@MXfive
Copy link
Contributor Author

MXfive commented Oct 3, 2024

@kfcampbell This is ready for review now :)

@MXfive MXfive requested a review from kfcampbell October 3, 2024 05:57
@joshmyers
Copy link

Love to see this go in 🙏

@bsgrigorov
Copy link

This would be very useful for us.

@MXfive MXfive force-pushed the main branch 2 times, most recently from 02b1017 to da0f157 Compare October 24, 2024 02:39
@muhlba91
Copy link

it would be awesome if this could be merged soon.

@zepeng811
Copy link
Contributor

@kfcampbell @nickfloyd gentle bump, can we get some eyes on this PR please

@MXfive
Copy link
Contributor Author

MXfive commented Nov 27, 2024

Bumping this again, been very long now we are stuck on this old forked privier, anything more needed to get this reviewed and merged? @kfcampbell

@valerioditinno
Copy link

This would be very useful for us as well

@talcoh2x
Copy link

talcoh2x commented Dec 7, 2024

+1

@bhargavms
Copy link

+1, please expedite this 🙏

@metju-ac
Copy link

+1

@prokop75
Copy link

@kfcampbell we are blocked on this as well. Could this get merged?

@kerbou
Copy link

kerbou commented Jan 9, 2025

@kfcampbell @nickfloyd We would also love this feature to be merged - it's preventing us from going all-in on this provider, leaving us with maintaining 1000+ of lines of custom Powershell code... :/

@ccogan-lh
Copy link

@kfcampbell @nickfloyd - any update on this getting merged? Appreciate it!!

@MXfive
Copy link
Contributor Author

MXfive commented Jan 20, 2025

@kfcampbell @nickfloyd is there something missing or needed to be done to get this PR going? There have been multiple releases since this has been ready for review several months ago now. Would really like to get us off of what was hoped to be a short lived private build of this provider until this was merged. From the comments here it would be of great value to many others too.

If there is anything else needed, please let me know so that I can get it done.

@zepeng811
Copy link
Contributor

zepeng811 commented Jan 21, 2025

+1 with all the echos above trying to get this merged, I'm also trying to get our corporate GitHub account manager to help escalate with this review, but got no responses so far. If you have a GitHub account manager at your corporation would be great if you can also shoot them an email.

@MXfive
Copy link
Contributor Author

MXfive commented Feb 25, 2025

Bumping this with the hope it can be merged almost 6 months since beigng ready.. @kfcampbell @nickfloyd

@ltshb
Copy link

ltshb commented Feb 27, 2025

I hope this can be soon reviewed and merged I'm looking forward of using the merge queue feature.

@kfcampbell
Copy link
Member

Apologies for the delay here, @nickfloyd have been working on other workstreams internal to GitHub. We're experimenting with a workflow that gives us a day per month for SDK reviews and releases now. The existing integration tests were broken here, so I've pushed 7b10791 and 5c70857 with some test and util fixes. Integration tests are now good, and I'll do some manual testing before merge/release soon.

Copy link
Member

@kfcampbell kfcampbell left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've manually validated this now in a few different scenarios. I'll merge and release shortly.

@kfcampbell kfcampbell merged commit e5f0c4c into integrations:main Feb 27, 2025
3 checks passed
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

Successfully merging this pull request may close these issues.

[FEAT]: Add support for Merge queue on github.