Skip to content

ci: run PR checks on merge_group so the merge queue works#151

Merged
sdbondi merged 1 commit into
mainfrom
ci-merge-queue
Jun 2, 2026
Merged

ci: run PR checks on merge_group so the merge queue works#151
sdbondi merged 1 commit into
mainfrom
ci-merge-queue

Conversation

@sdbondi
Copy link
Copy Markdown
Member

@sdbondi sdbondi commented Jun 1, 2026

Summary

The repo's main branch ruleset enables a merge queue (SQUASH, ALLGREEN) and requires the Test status check. However, pr-check.yml only triggered on pull_request and workflow_dispatch.

When a PR is added to the queue, GitHub creates a gh-readonly-queue/main/... branch and dispatches a merge_group event. With no workflow listening for that event, the required Test check never runs on the queue branch, so the queue entry sits in AWAITING_CHECKS until the 60-minute timeout — nothing can merge through the queue. (This is exactly what happened to #150, which had to be merged manually.)

Fix

Add the merge_group trigger to pr-check.yml:

on:
  pull_request:
  merge_group:
  workflow_dispatch:

Now the Test (and file licenses) jobs run on the queue branch, the queue sees the required check report green, and merges complete.

⚠️ This PR needs a one-time bypass merge

GitHub only fires merge_group for workflows that exist on the default branch. Since main doesn't yet contain this trigger, the queue still can't validate this PR — it will stall like the others. This PR must therefore be merged once via admin/bypass (org admins have bypass_mode: always on the ruleset). Every PR after this lands on main will merge through the queue normally.

Docs/CI-config only; no application code changes.

🤖 Generated with Claude Code

The repo's branch ruleset enables a merge queue and requires the
`Test` status check, but `pr-check.yml` only triggered on
`pull_request`/`workflow_dispatch`. When a PR enters the queue, GitHub
dispatches a `merge_group` event on the queue branch; with no workflow
listening for it, `Test` never runs there and the queue entry stalls in
AWAITING_CHECKS until the 60-minute timeout, so nothing can merge.

Add the `merge_group` trigger so the required `Test` (and licenses) jobs
run on the queue branch and the queue can complete merges.

Note: because GitHub only fires `merge_group` for workflows present on
the default branch, this PR cannot validate through the queue itself and
must be merged once via admin/bypass. Subsequent PRs will merge normally.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@gemini-code-assist
Copy link
Copy Markdown

Note

Gemini is unable to generate a review for this pull request due to the file types involved not being currently supported.

@sdbondi sdbondi merged commit 6bcfe35 into main Jun 2, 2026
4 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.

1 participant