Skip to content

Commit

Permalink
chore(build): update mergify config (#327)
Browse files Browse the repository at this point in the history
now that strict mode is gone.  See https://blog.mergify.com/strict-mode-deprecation/
  • Loading branch information
dbyron-sf authored Mar 4, 2022
1 parent 4919759 commit 6ccf799
Showing 1 changed file with 26 additions and 11 deletions.
37 changes: 26 additions & 11 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
queue_rules:
- name: default
conditions:
- status-success=build

pull_request_rules:
- name: Automatically merge on CI success and review
conditions:
Expand All @@ -6,46 +11,56 @@ pull_request_rules:
- 'label=ready to merge'
- 'approved-reviews-by=@oss-approvers'
actions:
merge:
queue:
method: squash
strict: smart
- name: Automatically self merge on CI success
name: default
label:
add: ['auto merged']
- name: Automatically merge release branch changes on CI success and release manager review
conditions:
- base=master
- status-success=build
- 'label=ready to merge'
- 'label=self merge'
actions:
merge:
queue:
method: squash
strict: smart
name: default
label:
add: ['auto merged']
- name: Automatically rebase and merge on CI success and review
conditions:
- base=master
- status-success=build
- 'label=ready to rebase'
- 'approved-reviews-by=@oss-approvers'
actions:
merge:
queue:
method: rebase
strict: smart
name: default
label:
add: ['auto merged']
- name: Automatically rebase and self merge on CI success
conditions:
- base=master
- status-success=build
- 'label=ready to rebase'
- 'label=self merge'
actions:
merge:
queue:
method: rebase
strict: smart
name: default
label:
add: ['auto merged']
- name: Automatically merge release branch changes on Travis CI success and release manager review
conditions:
- base~=^release-
- status-success=build
- 'label=ready to merge'
- 'approved-reviews-by=@release-managers'
actions:
merge:
queue:
method: squash
strict: smart
name: default
label:
add: ['auto merged']

0 comments on commit 6ccf799

Please sign in to comment.