Infra: Enable Merge Queue with required CI gates - #3832
Merged
kevinjqliu merged 7 commits intoSep 3, 2026
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR updates the repository’s CI/merge infrastructure so GitHub auto-merge cannot merge a PR until merge-critical workflows have actually produced the expected check contexts.
Changes:
- Removes
pull_request.pathsfilters from key workflows so they always run on PRs (preventing “required check pending because workflow was skipped”). - Adds an explicit
required_status_checks.contextsallowlist formainin.asf.yamlto require specific CI check contexts before merging.
Reviewed changes
Copilot reviewed 4 out of 4 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| .github/workflows/python-integration.yml | Removes PR path filters so integration suites always run on PRs. |
| .github/workflows/python-ci.yml | Removes PR path filters so unit/lint/Windows/smoke checks always run on PRs. |
| .github/workflows/check-md-link.yml | Removes PR path filters so markdown link checking runs on all PRs. |
| .asf.yaml | Explicitly enumerates required CI check contexts for branch protection / auto-merge gating. |
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
rambleraptor
approved these changes
Aug 24, 2026
rambleraptor
left a comment
rambleraptor
left a comment
Collaborator
There was a problem hiding this comment.
This will increase our runner usage for non-code changes. Most of our PRs are code related, so this is hopefully a wash.
kevinjqliu
marked this pull request as draft
September 1, 2026 01:06
kevinjqliu
commented
Sep 2, 2026
Comment on lines
-39
to
-40
| # strict means "Require branches to be up to date before merging". | ||
| strict: true |
Contributor
Author
There was a problem hiding this comment.
removed so merge queue is the source of truth
kevinjqliu
commented
Sep 2, 2026
Comment on lines
-27
to
-39
| paths: | ||
| - '**' # Include all files and directories in the repository by default. | ||
| - '!.github/workflows/**' # Exclude all workflow files | ||
| - '.github/workflows/python-ci.yml' # except the current file. | ||
| - '!.github/ISSUE_TEMPLATE/**' # Exclude files and directories that don't impact tests or code like templates, metadata, and documentation. | ||
| - '!.gitignore' | ||
| - '!.asf.yml' | ||
| - '!mkdocs/**' | ||
| - '!.gitattributes' | ||
| - '!README.md' | ||
| - '!CONTRIBUTING.md' | ||
| - '!LICENSE' | ||
| - '!NOTICE' |
Contributor
Author
There was a problem hiding this comment.
i think this is a ok trade off to enable merge queue.
merge queue requires checks to always run
kevinjqliu
commented
Sep 2, 2026
Comment on lines
+65
to
+71
| ### Required CI and Merge Queue | ||
|
|
||
| - Keep the `required_status_checks.contexts` list in `.asf.yaml` synchronized whenever a required job/check is added, renamed, or removed. Each entry is a job/check context name, not a workflow filename. | ||
| - Verify that every required context reports for both `pull_request` and `merge_group`. Its producer workflow must run on both events. | ||
| - When a workflow uses an aggregate required job, such as `python-ci-required`, keep `if: always()` and its `needs` list in sync with every job whose result should block merging. | ||
| - Do not use `pull_request` path filters in workflows that produce required contexts. A skipped workflow does not report its required context, which blocks pull requests and causes Merge Queue entries to time out. | ||
|
|
Contributor
Author
There was a problem hiding this comment.
added some rules here so agents can understand the links between files
kevinjqliu
changed the title
kevinjqliu
marked this pull request as ready for review
September 2, 2026 18:19
Fokko
approved these changes
Sep 3, 2026
Fokko
left a comment
Fokko
left a comment
Contributor
There was a problem hiding this comment.
This is new to me, but I guess we can give it a spin
This was referenced Sep 3, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Rationale
PR #3815 enabled auto-merge. This PR completes that work by adding the required checks and configuration needed for GitHub Merge Queue.
Changes
.asf.yamldefines the checks Merge Queue must wait for. Stable aggregate Python gates cover all jobs and always report a final result, following DataFusion's pattern (workflow, required context).Analyze Actionsgates the CodeQL workflow; the separateCodeQLstatus is omitted because it is not reported for merge groups (GitHub CodeQL issue).strictis omitted because Merge Queue provides up-to-date validation and ASF defaults it tofalse(ASF branch protection).merge_group; GitHub requires this event for queue checks to report (GitHub documentation). This matches DataFusion's configuration (lines 24-39).Testing
Repository lint hooks, YAML validation, and workflow coverage assertions pass. No user-facing changes.