diff options
| author | github-actions[bot] | 2022-01-11 18:23:46 -0800 |
|---|---|---|
| committer | GitHub | 2022-01-11 18:23:46 -0800 |
| commit | d1ba3b0c23886e4f7e11625f1458fb90b405effc (patch) | |
| tree | 821fc007711032139655bd5981f1d505200d9fff /.mergify.yml | |
| parent | 3e494b5cceda14a73f288a293dd007a82be18bb8 (diff) | |
Update .mergify.yml (#2454)
Diffstat (limited to '.mergify.yml')
| -rw-r--r-- | .mergify.yml | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/.mergify.yml b/.mergify.yml index 5e77c8d9..1d699865 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 1.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 1.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 1.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 |