From 6e501c7aa30f47df20f32358b1bf5d0d7b1026a4 Mon Sep 17 00:00:00 2001
From: Julien Danjou <julien@danjou.info>
Date: Thu, 4 Oct 2018 10:06:30 +0200
Subject: [PATCH] Update to Mergify v2 engine

---
 .mergify.yml | 99 ++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 76 insertions(+), 23 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index 5e9142bc..e8e021f0 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,24 +1,77 @@
-rules:
-  default:
-    protection:
-      required_status_checks:
-        strict: True
-        contexts:
-          - continuous-integration/travis-ci
-      required_pull_request_reviews:
-        required_approving_review_count: 2
-    merge_strategy:
-      method: rebase
-    automated_backport_labels:
-      backport-to-4.3: stable/4.3
-      backport-to-4.2: stable/4.2
-      backport-to-4.1: stable/4.1
-      backport-to-4.0: stable/4.0
-      backport-to-3.1: stable/3.1
-      backport-to-3.0: stable/3.0
-  branches:
-    '^stable/.*':
-      protection:
-        required_pull_request_reviews:
-          required_approving_review_count: 1
+pull_request_rules:
+  - name: automatic merge
+    actions:
+      merge:
+        method: rebase
+        rebase_fallback: merge
+        strict: true
+    conditions:
+    - label!=work-in-progress
+    - '#approved-reviews-by>=2'
+    - status-success=continuous-integration/travis-ci/pr
+  - name: merge backport to stable with one review
+    actions:
+      merge:
+        method: rebase
+        rebase_fallback: merge
+        strict: true
+    conditions:
+    - base~=^stable/.*
+    - label!=work-in-progress
+    - '#approved-reviews-by>=1'
+    - status-success=continuous-integration/travis-ci/pr
+  - name: automatic merge backports from Mergify
+    actions:
+      merge:
+        method: rebase
+        rebase_fallback: merge
+        strict: true
+    conditions:
+    - base~=^stable/.*
+    - label!=work-in-progress
+    - author=mergify[bot]
+    - status-success=continuous-integration/travis-ci/pr
 
+# Backports to stable branches
+  - actions:
+      backport:
+        branches:
+        - stable/3.0
+    conditions:
+    - label=backport-to-3.0
+    name: backport stable/3.0
+  - actions:
+      backport:
+        branches:
+        - stable/3.1
+    conditions:
+    - label=backport-to-3.1
+    name: backport stable/3.1
+  - actions:
+      backport:
+        branches:
+        - stable/4.0
+    conditions:
+    - label=backport-to-4.0
+    name: backport stable/4.0
+  - actions:
+      backport:
+        branches:
+        - stable/4.1
+    conditions:
+    - label=backport-to-4.1
+    name: backport stable/4.1
+  - actions:
+      backport:
+        branches:
+        - stable/4.2
+    conditions:
+    - label=backport-to-4.2
+    name: backport stable/4.2
+  - actions:
+      backport:
+        branches:
+        - stable/4.3
+    conditions:
+    - label=backport-to-4.3
+    name: backport stable/4.3
-- 
GitLab