Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(build): update Mergify config #9785

Merged
merged 1 commit into from
Dec 7, 2021
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 20 additions & 32 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -1,63 +1,51 @@
pull_request_rules:
- name: Automatically merge on CI success and review
queue_rules:
- name: default
conditions:
- base=master
- status-success=Deck CI
- name: backport
conditions:
- base~=^release-
- status-success=Deck CI

pull_request_rules:
- name: Automatically merge on CI success and review
conditions:
- 'label=ready to merge'
- 'approved-reviews-by=@oss-approvers'
actions:
merge:
queue:
method: squash
strict: smart
name: default
- name: Automatically self merge on CI success
conditions:
- base=master
- status-success=Deck CI
- 'label=ready to merge'
- 'label=self merge'
actions:
merge:
queue:
method: squash
strict: smart
name: default
- name: Automatically rebase and merge on CI success and review
conditions:
- base=master
- status-success=Deck CI
- 'label=ready to rebase'
- 'approved-reviews-by=@oss-approvers'
actions:
merge:
queue:
method: rebase
strict: smart
name: default
- name: Automatically rebase and self merge on CI success
conditions:
- base=master
- status-success=Deck CI
- 'label=ready to rebase'
- 'label=self merge'
actions:
merge:
queue:
method: rebase
strict: smart
name: default
- name: Automatically merge release branch changes on Travis CI success and release manager review
conditions:
- base~=^release-
- status-success=Deck CI
- 'label=ready to merge'
- 'approved-reviews-by=@release-managers'
actions:
merge:
method: squash
strict: smart
# This rule exists to handle release branches that are still building using Travis CI instead of
# using Github actions. It can be deleted once all active release branches are running Github actions.
- name: Automatically merge release branch changes on Travis CI success and release manager review
conditions:
- base~=^release-
- status-success=continuous-integration/travis-ci/pr
- 'label=ready to merge'
- 'approved-reviews-by=@release-managers'
actions:
merge:
queue:
method: squash
strict: smart
name: backport