Skip to content

Conversation

blaginin
Copy link
Contributor

@blaginin blaginin commented Aug 19, 2025

Which issue does this PR close?

Related to apache/datafusion#6880

Rationale for this change

Before we enable Merge Queue, we need to prepare our CI

What changes are included in this PR?

Merge Queue only waits for the required steps - us all checks are important hence I made them all required.
It'll become impossible to merge a PR if some of the checks are not passed, but I believe that's the flow we use now anyways.

I also added a MQ trigger as required in the MQ docs

Demo PR:

blaginin-org#1

@blaginin
Copy link
Contributor Author

I get that for this repo it isn't super critical since CI is fast, but:

  • would be good to enforce the branch being up to date with main (a good use case for MQ)
  • feels good to be consistent across repos
  • I want to make sure everyone is happy with the flow before we release it onto the main repo 🙂

@blaginin blaginin marked this pull request as ready for review September 1, 2025 18:32
@blaginin blaginin requested a review from alamb September 1, 2025 18:33
@blaginin
Copy link
Contributor Author

blaginin commented Sep 1, 2025

image

In case something would go wrong during testing, we now have a way to force merge. So should be good to merge and test

Copy link
Contributor

@alamb alamb left a comment

Choose a reason for hiding this comment

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

Thanks @blaginin -- looks good to me

@iffyio hopefully it is good for you too

on:
push:
branches-ignore:
- 'gh-readonly-queue/**'
Copy link
Contributor

Choose a reason for hiding this comment

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

What is this for? Can we perhaps add some comments explaining what this branch ignore is for?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Added

@@ -23,6 +23,7 @@ on:
branches:
- main
pull_request:
merge_group:
Copy link
Contributor

Choose a reason for hiding this comment

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

@alamb alamb changed the title Merge queue prep Enable merge queue in sqlparser-rs Sep 4, 2025
@blaginin
Copy link
Contributor Author

blaginin commented Sep 4, 2025

Small note for clarity: this pr itself won't enable MQ - this has to be done manually by the ASF Infra. But it'll make necessary changes on our side for that 🙂

@blaginin
Copy link
Contributor Author

blaginin commented Sep 4, 2025

I'm going to merge to test it. Will keep an eye on the repo - @iffyio if something is inconvenient with the new setup, feel free to ping me and I'll fix it

@blaginin blaginin merged commit dd3342e into apache:main Sep 4, 2025
10 checks passed
@blaginin
Copy link
Contributor Author

blaginin commented Sep 4, 2025

All steps are now required - seems to be working :)

Zen Browser 2025-09-04 21 28 46

Asked the infra time to enable the merge queue for this repo as we have everything set up on our side

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.

2 participants