From 3e92264232400b5fa2cf63d8b1ce80e8e1792516 Mon Sep 17 00:00:00 2001 From: Julian Goldstein Date: Fri, 19 Jun 2026 14:19:51 -0500 Subject: [PATCH] ci: run markers check on merge_group so the queue isn't deadlocked [bump:patch] A required 'markers' check + merge queue deadlocks: the queue fires merge_group and waits for required checks to report there, but the check only triggered on pull_request. Add the merge_group trigger; the validate step stays gated to pull_request (markers are already enforced at PR open), so on merge_group the job runs and reports green. Co-Authored-By: Claude Opus 4.8 --- .github/workflows/commit-convention.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/commit-convention.yml b/.github/workflows/commit-convention.yml index c5df7a2..2b5886b 100644 --- a/.github/workflows/commit-convention.yml +++ b/.github/workflows/commit-convention.yml @@ -8,6 +8,10 @@ name: commit-convention on: pull_request: types: [opened, edited, reopened, synchronize] + # The merge queue fires merge_group and waits for required checks to report on + # it. Markers are already validated at PR time, so the job just needs to run + # and pass here — otherwise a required "markers" check deadlocks the queue. + merge_group: permissions: contents: read @@ -21,6 +25,7 @@ jobs: fetch-depth: 0 - name: Validate [bump:*] markers + if: github.event_name == 'pull_request' # merge_group: validated at PR time, just report green env: PR_TITLE: ${{ github.event.pull_request.title }} BASE_SHA: ${{ github.event.pull_request.base.sha }}