Skip to content

Commit e1e27de

Browse files
authored
Merge pull request #9879 from geekosaur/wip/geekosaur/ci-backport-squash
add squash+merge for backports
2 parents d5f59e7 + 45b9f0b commit e1e27de

File tree

1 file changed

+15
-0
lines changed

1 file changed

+15
-0
lines changed

.github/mergify.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,21 @@ pull_request_rules:
7171
- body~=backport
7272
- '#approved-reviews-by>=1'
7373

74+
# merge+squash strategy for backports: require 1 approver instead of 2
75+
- actions:
76+
queue:
77+
name: default
78+
method: squash
79+
# both update methods get absorbed by the squash, so we use the most
80+
# reliable
81+
update_method: merge
82+
name: Put backports in the squash+merge queue
83+
conditions:
84+
- label=squash+merge me
85+
- base!=master
86+
- body~=backport
87+
- '#approved-reviews-by>=1'
88+
7489
# backports should be labeled as such
7590
- actions:
7691
label:

0 commit comments

Comments
 (0)