Skip to content

Commit

Permalink
ci(mergify): upgrade configuration to current format
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] committed Nov 20, 2024
1 parent f549793 commit a0e6b7d
Showing 1 changed file with 24 additions and 17 deletions.
41 changes: 24 additions & 17 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@

pull_request_rules:
- name: automatic squash-merge for master when CI passes and approved
conditions:
- name: refactored queue action rule
conditions: []
actions:
queue:
queue_rules:
- 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 @@ -9,13 +15,6 @@ 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:
- "#approved-reviews-by>=1"
- and:
# Unfortunately, we cannot just say "all CI must pass".
Expand All @@ -24,18 +23,26 @@ 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: []
merge_method: squash
update_method: rebase
method: rebase
- name: default
conditions:
queue_conditions:
- "#approved-reviews-by>=1"
- 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
- base=master
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
merge_method: squash
update_method: rebase

0 comments on commit a0e6b7d

Please sign in to comment.