From 498b833aa5f44a9b998d4b93edf9495c0498e0cd Mon Sep 17 00:00:00 2001
From: Jack Koenig
Date: Wed, 13 May 2020 12:53:57 -0700
Subject: [Mergify] Add back backporting to 1.2.x (#1595)

Labeling a PR with Milestone 1.2.X now will tell Mergify to backport it
to both 1.2.x and 1.3.x.

Co-authored-by: Albert Magyar <albert.magyar@gmail.com>---
 .mergify.yml | 33 +++++++++++++++++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

(limited to '.mergify.yml')

diff --git a/.mergify.yml b/.mergify.yml
index f28da865..cf1f5f10 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -35,15 +35,30 @@ pull_request_rules:
       label:
         add: [Backported]
 
+  - name: backport to 1.2.x and 1.3.x
+    conditions:
+      - merged
+      - base=master
+      - milestone=1.2.X
+    actions:
+      backport:
+        branches:
+          - 1.2.x
+          - 1.3.x
+        ignore_conflicts: True
+        label_conflicts: "bp-conflict"
+      label:
+        add: [Backported]
+
+
   - name: label Mergify backport PR
     conditions:
-      - base=1.3.x
       - body~=This is an automated backport of pull request \#\d+ done by Mergify
     actions:
       label:
         add: [Backport]
 
-  - name: automatic squash-and-merge of backport PRs
+  - name: automatic squash-and-merge of 1.3.x backport PRs
     conditions:
       - status-success=continuous-integration/travis-ci/pr
       - "#changes-requested-reviews-by=0"
@@ -56,3 +71,17 @@ pull_request_rules:
         method: squash
         strict: smart
         strict_method: merge
+
+  - name: automatic squash-and-merge of 1.2.x backport PRs
+    conditions:
+      - status-success=continuous-integration/travis-ci/pr
+      - "#changes-requested-reviews-by=0"
+      - base=1.2.x
+      - label="Backport"
+      - label!="DO NOT MERGE"
+      - label!="bp-conflict"
+    actions:
+      merge:
+        method: squash
+        strict: smart
+        strict_method: merge
-- 
cgit v1.2.3