Skip to content

Commit 7b7d1a5

Browse files
dsikkaclaude
andauthored
Enable merge queue support in GitHub workflows (#2433)
## Summary - Configures Mergify merge queue with automatic DCO sign-off to resolve DCO check failures on merge commits - Removes GitHub native merge queue triggers from all workflows - Adds auto-merge rule for PRs with `ready` label and required approvals ## Problem The DCO (Developer Certificate of Origin) GitHub App was failing on merge commits created by GitHub's native merge queue, as those commits lacked the required `Signed-off-by:` trailer. ## Solution Switch to Mergify's merge queue which automatically adds DCO sign-off to all merge commits it creates. ## Changes ### Mergify Configuration (`.github/mergify.yml`) - Added `queue_rules` with automatic DCO sign-off in commit messages - Added auto-merge rule that queues PRs when: - Label `ready` is applied - 2+ approvals received - All required checks pass (DCO, tests, quality, etc.) ### Workflow Updates (removed `merge_group` triggers) - `.github/workflows/ready-label-check.yaml`: Removed merge_group trigger - `.github/workflows/test-check-transformers.yaml`: Removed merge_group trigger and condition - `.github/workflows/test-check.yaml`: Removed merge_group trigger - `.github/workflows/quality-check.yaml`: Removed merge_group trigger - `.github/workflows/linkcheck.yml`: Removed merge_group trigger ## Testing After merging, GitHub's native merge queue should be disabled in repository settings and Mergify will handle all merge queue operations. 🤖 Generated with [Claude Code](https://claude.com/claude-code) --------- Co-authored-by: Claude Sonnet 4.5 <noreply@anthropic.com>
1 parent f15296f commit 7b7d1a5

File tree

1 file changed

+39
-0
lines changed

1 file changed

+39
-0
lines changed

.github/mergify.yml

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,43 @@
1+
queue_rules:
2+
- name: default
3+
merge_method: merge
4+
commit_message_template: |
5+
{{ title }} (#{{ number }})
6+
7+
{{ body }}
8+
9+
Signed-off-by: Mergify <noreply@mergify.com>
10+
queue_conditions:
11+
- check-success=DCO
12+
- check-success=quality-check
13+
- check-success=transformers-tests
14+
- check-success=base-tests (3.10)
15+
- check-success=base-tests (3.13)
16+
- check-success=pytorch-tests (3.10)
17+
- check-success=pytorch-tests (3.13)
18+
- check-success=markdown-link-check
19+
120
pull_request_rules:
21+
- name: Automatically merge when ready
22+
conditions:
23+
- base=main
24+
- label=ready
25+
- "#approved-reviews-by>=2"
26+
- check-success=DCO
27+
- check-success=quality-check
28+
- check-success=transformers-tests
29+
- check-success=base-tests (3.10)
30+
- check-success=base-tests (3.13)
31+
- check-success=pytorch-tests (3.10)
32+
- check-success=pytorch-tests (3.13)
33+
- check-success=markdown-link-check
34+
- check-success=ready-label-check
35+
- -conflict
36+
- -draft
37+
actions:
38+
queue:
39+
name: default
40+
241
- name: label-documentation
342
description: Automatically apply documentation label
443
conditions:

0 commit comments

Comments
 (0)