diff options
| -rw-r--r-- | .github/configs/mergify_config.yml | 7 | ||||
| -rw-r--r-- | .mergify.yml | 28 |
2 files changed, 23 insertions, 12 deletions
diff --git a/.github/configs/mergify_config.yml b/.github/configs/mergify_config.yml new file mode 100644 index 00000000..dbed4fe8 --- /dev/null +++ b/.github/configs/mergify_config.yml @@ -0,0 +1,7 @@ +# Configuration for generating .mergify.yml +conditions: + - status-success=all tests passed +branches: + - 3.2.x + - 3.3.x + - 3.4.x diff --git a/.mergify.yml b/.mergify.yml index d3534b36..4ae8b5cd 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -1,3 +1,7 @@ +queue_rules: +- name: default + conditions: + - status-success=all tests passed pull_request_rules: - name: automatic squash-and-merge on CI success and review conditions: @@ -9,10 +13,10 @@ pull_request_rules: - label!="DO NOT MERGE" - label!="bp-conflict" actions: - merge: + queue: + name: default method: squash - strict: smart - strict_method: merge + update_method: merge - name: backport to 3.4.x conditions: - merged @@ -73,10 +77,10 @@ pull_request_rules: - label!="DO NOT MERGE" - label!="bp-conflict" actions: - merge: + queue: + name: default method: squash - strict: smart - strict_method: merge + update_method: merge - name: automatic squash-and-mege of 3.3.x backport PRs conditions: - status-success=all tests passed @@ -86,10 +90,10 @@ pull_request_rules: - label!="DO NOT MERGE" - label!="bp-conflict" actions: - merge: + queue: + name: default method: squash - strict: smart - strict_method: merge + update_method: merge - name: automatic squash-and-mege of 3.4.x backport PRs conditions: - status-success=all tests passed @@ -99,8 +103,8 @@ pull_request_rules: - label!="DO NOT MERGE" - label!="bp-conflict" actions: - merge: + queue: + name: default method: squash - strict: smart - strict_method: merge + update_method: merge |