Skip to content

Commit 853ebd7

Browse files
dsikkaclaude
andcommitted
Replace GitHub merge queue with Mergify queue for DCO compatibility
Configures Mergify to handle merge queue operations with automatic DCO sign-off, resolving DCO check failures on merge commits. Removes GitHub native merge queue triggers from all workflows. Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
1 parent 04d2dd7 commit 853ebd7

File tree

5 files changed

+46
-4
lines changed

5 files changed

+46
-4
lines changed

.github/mergify.yml

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,50 @@
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+
commit_message_template: |
41+
{{ title }} (#{{ number }})
42+
43+
{{ body }}
44+
45+
Signed-off-by: Mergify <noreply@mergify.com>
46+
47+
- name: label-documentation
248
- name: label-documentation
349
description: Automatically apply documentation label
450
conditions:

.github/workflows/linkcheck.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ on:
55
branches: [ main, 'release/*' ]
66
pull_request:
77
branches: [ main, 'release/*' ]
8-
merge_group:
98

109
# Allows you to run this workflow manually from the Actions tab
1110
workflow_dispatch:

.github/workflows/quality-check.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ on:
44
branches: [ main , 'release/*' ]
55
pull_request:
66
branches: [ main, 'release/*' ]
7-
merge_group:
87

98
concurrency:
109
group: ${{ github.workflow }}-${{ github.ref }}

.github/workflows/test-check-transformers.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ on:
55
types: [ labeled, synchronize ]
66
push:
77
branches: [ main, 'release/*' ]
8-
merge_group:
98
workflow_dispatch:
109
inputs:
1110
code_coverage:

.github/workflows/test-check.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ on:
44
branches: [ main, 'release/*' ]
55
push:
66
branches: [ main, 'release/*' ]
7-
merge_group:
87
workflow_dispatch:
98
inputs:
109
code_coverage:

0 commit comments

Comments
 (0)