Skip to content

Commit

Permalink
Merge pull request #9879 from geekosaur/wip/geekosaur/ci-backport-squash
Browse files Browse the repository at this point in the history
add squash+merge for backports
  • Loading branch information
mergify[bot] committed Apr 18, 2024
2 parents d5f59e7 + 45b9f0b commit e1e27de
Showing 1 changed file with 15 additions and 0 deletions.
15 changes: 15 additions & 0 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,21 @@ pull_request_rules:
- body~=backport
- '#approved-reviews-by>=1'

# merge+squash strategy for backports: require 1 approver instead of 2
- actions:
queue:
name: default
method: squash
# both update methods get absorbed by the squash, so we use the most
# reliable
update_method: merge
name: Put backports in the squash+merge queue
conditions:
- label=squash+merge me
- base!=master
- body~=backport
- '#approved-reviews-by>=1'

# backports should be labeled as such
- actions:
label:
Expand Down

0 comments on commit e1e27de

Please sign in to comment.