Skip to content

Merge queue: make dev checks required + add .asf.yaml validation#21239

Open
blaginin wants to merge 1 commit intomainfrom
db/mq-is-back
Open

Merge queue: make dev checks required + add .asf.yaml validation#21239
blaginin wants to merge 1 commit intomainfrom
db/mq-is-back

Conversation

@blaginin
Copy link
Copy Markdown
Member

@blaginin blaginin commented Mar 29, 2026

Related to #6880

Follow up on #17538

Bringing back the merge queues 🤞🏻
Last time it was painful because:

  • there was no .asf.yaml validation
  • if something goes wrong, we weren't able to force merge without the infra team

this PR solved the first problem. As for the second one, I have the permissions to bypass so should be able to quickly revert if something ever goes bad

image

Check result: https://github.com/apache/datafusion/actions/runs/23715604583/job/69082077684?pr=21239

I also checked that CI will keep working by merging this into our sandbox and then opening and merging a dummy pr

For now, bringing just the basic checks (in dev.yml). Will do rust.yml separately if everything goes smoothly after this one is merged

@blaginin blaginin self-assigned this Mar 29, 2026
@github-actions github-actions bot added the development-process Related to development process of DataFusion label Mar 29, 2026
@blaginin blaginin marked this pull request as ready for review March 29, 2026 18:27
@blaginin blaginin requested review from 2010YOUY01 and alamb March 30, 2026 12:00
@alamb
Copy link
Copy Markdown
Contributor

alamb commented Mar 30, 2026

Amazing -- this will be so nice

Copy link
Copy Markdown
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

What do you think of the codeql suggestion to limit the token? I think that is a good idea in light of the recent npm supply chain attacks

Also, does this PR enable the merge queue? I didn't see any specific change but maybe I missed it

contexts:
- "Check License Header"
- "Use prettier to check formatting of documents"
- "Validate required_status_checks in .asf.yaml"
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

this is a clever idea

@blaginin
Copy link
Copy Markdown
Member Author

thanks for the review!

What do you think of the codeql suggestion to limit the token? I think that is a good idea in light of the recent npm supply chain attacks

sure! i think we need to limit those for all the actions, will do that in the PR on top

Also, does this PR enable the merge queue? I didn't see any specific change but maybe I missed it

it's actually already enabled!

image currently it's a no-op because there are no required checks (MQ only runs the required ones). once we add them, the merge queue will start working!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

development-process Related to development process of DataFusion

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants