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

ci(mergify): upgrade configuration to current format #891

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
46 changes: 30 additions & 16 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@

pull_request_rules:
- name: automatic squash-merge for master when CI passes and approved
conditions:
- name: automatic merge for stable when CI passes and approved + automatic squash-merge
for master when CI passes and approved
conditions: []
actions:
queue:
queue_rules:
- name: duplicated default from automatic squash-merge for master when CI passes
and approved
queue_conditions:
- "#approved-reviews-by>=1"
- and:
# Unfortunately, we cannot just say "all CI must pass".
Expand All @@ -9,13 +17,17 @@ pull_request_rules:
- check-success=docker
- check-success=SonarCloud Code Analysis
- base=master
actions:
queue:
name: default
method: squash
update_method: rebase
- name: automatic merge for stable when CI passes and approved
conditions:
merge_conditions:
- and:
# Unfortunately, we cannot just say "all CI must pass".
# This is not a bot limitation, but a limitation in Github itself.
- check-success=all-tests
- check-success=docker
- check-success=SonarCloud Code Analysis
update_method: rebase
merge_method: squash
- name: duplicated default from automatic merge for stable when CI passes and approved
queue_conditions:
- "#approved-reviews-by>=1"
- and:
# Unfortunately, we cannot just say "all CI must pass".
Expand All @@ -24,13 +36,15 @@ pull_request_rules:
- check-success=docker
- check-success=SonarCloud Code Analysis
- base=stable
actions:
queue:
name: default
method: rebase
update_method: rebase

queue_rules:
merge_conditions:
- and:
# Unfortunately, we cannot just say "all CI must pass".
# This is not a bot limitation, but a limitation in Github itself.
- check-success=all-tests
- check-success=docker
- check-success=SonarCloud Code Analysis
update_method: rebase
merge_method: rebase
- name: default
conditions:
- and:
Expand Down
Loading