Skip to content

Commit b6bc46b

Browse files
nhortonclaude
andauthored
Debug merge queue CI jobs not running (#57)
* Fix cla-check job not reporting status in merge queue The cla.yml workflow had two separate jobs with different names: - merge-queue-pass: ran in merge queue - cla-check: ran for PRs only When branch protection requires 'cla-check' to pass, the merge queue would wait indefinitely because only 'merge-queue-pass' was being reported as a status, not 'cla-check'. Consolidate into a single 'cla-check' job that runs for all event types, using step-level conditions to skip the actual CLA work in merge queue context (since CLA is already verified at PR time). * Remove branches filter from merge_group triggers The merge queue creates temporary refs like gh-readonly-queue/main/pr-N-xxx. The branches: [main] filter was preventing workflows from triggering because the ref name doesn't match the simple "main" glob pattern. Since merge queue is only enabled for specific branches via branch protection rules anyway, the branches filter on merge_group events is redundant and causes the workflows to never run. This fixes all 4 required checks (tests, claude-code-e2e, cla-check, validate-generation) not running in merge queue. --------- Co-authored-by: Claude <noreply@anthropic.com>
1 parent feb0ecf commit b6bc46b

3 files changed

Lines changed: 16 additions & 14 deletions

File tree

.github/workflows/cla.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ on:
99
# Run in merge queue but skip the step (shows as passing check)
1010
merge_group:
1111
types: [checks_requested]
12-
branches: [main]
12+
# Note: Don't use branches filter here - merge queue refs like
13+
# gh-readonly-queue/main/pr-N-xxx don't match simple branch globs
1314
workflow_dispatch:
1415

1516
# Explicitly set permissions for the workflow
@@ -20,20 +21,19 @@ permissions:
2021
statuses: write
2122

2223
jobs:
23-
# Job for merge queue - always passes since CLA is checked at PR time
24-
merge-queue-pass:
24+
# Single job that handles all event types with consistent naming
25+
# This ensures the 'cla-check' status is reported for both PRs and merge queue
26+
cla-check:
2527
runs-on: ubuntu-latest
26-
if: github.event_name == 'merge_group' || github.event_name == 'workflow_dispatch'
2728
steps:
28-
- name: CLA already verified at PR time
29+
# For merge queue and workflow_dispatch: skip actual CLA check (already verified at PR time)
30+
- name: Skip CLA for merge queue
31+
if: github.event_name == 'merge_group' || github.event_name == 'workflow_dispatch'
2932
run: echo "CLA check is performed on PRs, not in merge queue. Passing."
3033

31-
cla-check:
32-
runs-on: ubuntu-latest
33-
if: github.event_name != 'merge_group' && github.event_name != 'workflow_dispatch'
34-
steps:
34+
# For PRs and issue comments: run the actual CLA check
3535
- name: "CLA Assistant"
36-
if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
36+
if: github.event_name != 'merge_group' && github.event_name != 'workflow_dispatch' && ((github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target')
3737
uses: contributor-assistant/github-action@v2.6.1
3838
env:
3939
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -45,10 +45,10 @@ jobs:
4545
# Branch where CLA signatures will be stored
4646
branch: 'IMPT_cla_signatures'
4747
allowlist: 'dependabot[bot],github-actions[bot],claude,copilot,copilot-swe-agent[bot]'
48-
48+
4949
# Custom text for the CLA comment
5050
custom-pr-sign-comment: 'I have read the CLA Document and I hereby sign the CLA'
5151
custom-allsigned-prcomment: 'All contributors have signed the CLA. ✅'
52-
52+
5353
lock-pullrequest-aftermerge: false
5454
use-dco-flag: true

.github/workflows/claude-code-test.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ on:
1515
# Run in the merge queue to validate before merging
1616
merge_group:
1717
types: [checks_requested]
18-
branches: [main]
18+
# Note: Don't use branches filter here - merge queue refs like
19+
# gh-readonly-queue/main/pr-N-xxx don't match simple branch globs
1920

2021
# Ensure only one instance runs at a time per PR/branch
2122
concurrency:

.github/workflows/validate.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ on:
55
branches: [main]
66
merge_group:
77
types: [checks_requested]
8-
branches: [main]
8+
# Note: Don't use branches filter here - merge queue refs like
9+
# gh-readonly-queue/main/pr-N-xxx don't match simple branch globs
910
workflow_dispatch:
1011

1112
# Minimal permissions for this workflow

0 commit comments

Comments
 (0)