Skip to content

Commit c719bb9

Browse files
committed
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).
1 parent 0dbd512 commit c719bb9

1 file changed

Lines changed: 10 additions & 11 deletions

File tree

.github/workflows/cla.yml

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,19 @@ permissions:
2020
statuses: write
2121

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

31-
cla-check:
32-
runs-on: ubuntu-latest
33-
if: github.event_name != 'merge_group' && github.event_name != 'workflow_dispatch'
34-
steps:
33+
# For PRs and issue comments: run the actual CLA check
3534
- 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'
35+
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')
3736
uses: contributor-assistant/github-action@v2.6.1
3837
env:
3938
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -45,10 +44,10 @@ jobs:
4544
# Branch where CLA signatures will be stored
4645
branch: 'IMPT_cla_signatures'
4746
allowlist: 'dependabot[bot],github-actions[bot],claude,copilot,copilot-swe-agent[bot]'
48-
47+
4948
# Custom text for the CLA comment
5049
custom-pr-sign-comment: 'I have read the CLA Document and I hereby sign the CLA'
5150
custom-allsigned-prcomment: 'All contributors have signed the CLA. ✅'
52-
51+
5352
lock-pullrequest-aftermerge: false
5453
use-dco-flag: true

0 commit comments

Comments
 (0)