Skip to content

ci: prevent skipped push checks from bypassing merge queue - #11894

Merged
sdf-jkl merged 2 commits into
apache:mainfrom
sdf-jkl:fix/merge-queue-push-trigger
Oct 24, 2026
Merged

sdf-jkl merged 2 commits into
apache:mainfrom
sdf-jkl:fix/merge-queue-push-trigger

Conversation

@sdf-jkl

@sdf-jkl sdf-jkl commented Oct 24, 2026

Copy link
Copy Markdown
Member

Summary

Fix premature merge-queue merges introduced by #11788.

The broadened push trigger also matches GitHub-managed gh-readonly-queue/** branches. A queue commit therefore triggers both push and merge_group runs of the CI workflow. The upstream queue-branch push run skips Required Checks, potentially satisfying the required status prematurely while the full merge_group run is still pending.

It's actually in DataFusion too, but I missed it 🤦

Fix

  • Exclude gh-readonly-queue/** from push-triggered CI while keeping fork branch pushes enabled.
  • Update the CI configuration validation test to enforce this exclusion.
  • Keep merge_group CI unchanged.

Evidence

Validation

Static workflow config/assertion updated. The behavior still needs validation with an actual merge-queue PR. Keep this as draft until verified.

@github-actions github-actions Bot added the development-process Internal changes; PRs with this label are excluded from changelog label Oct 24, 2026
@sdf-jkl

sdf-jkl commented Oct 24, 2026

Copy link
Copy Markdown
Member Author

@alamb @Jefffrey

@alamb

alamb commented Oct 24, 2026

Copy link
Copy Markdown
Contributor

It's actually in DataFusion too, but I missed it 🤦

As in Datafusion PRs bypass the queue? I have seen several PRs that got rejected by tests in the queue, so I am not sure about this

@alamb alamb left a comment

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.

let's try it

@alamb

alamb commented Oct 24, 2026

Copy link
Copy Markdown
Contributor

Thank you @sdf-jkl

@sdf-jkl

sdf-jkl commented Oct 24, 2026

Copy link
Copy Markdown
Member Author

As in DataFusion added an exception for gh-readonly-queue/**

Datafusion is fine 🫡

@sdf-jkl
sdf-jkl added this pull request to the merge queue Oct 24, 2026
Merged via the queue into apache:main with commit 34bf27b Oct 24, 2026
21 checks passed
@Jefffrey

Copy link
Copy Markdown
Contributor

thanks for this ❤️

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

Labels

development-process Internal changes; PRs with this label are excluded from changelog

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants