From 1f7faaa36816fc145a39bb7e736fd5ab739112c4 Mon Sep 17 00:00:00 2001
From: github-actions[bot]
Date: Mon, 19 Apr 2021 15:37:10 -0700
Subject: Update .mergify.yml (#2181)

Co-authored-by: jackkoenig <jackkoenig@users.noreply.github.com>---
 .mergify.yml | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to '.mergify.yml')

diff --git a/.mergify.yml b/.mergify.yml
index 3929b423..5e77c8d9 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -22,6 +22,8 @@ pull_request_rules:
     backport:
       branches:
       - 1.4.x
+      labels:
+      - Backport
       ignore_conflicts: true
       label_conflicts: bp-conflict
     label:
@@ -37,6 +39,8 @@ pull_request_rules:
       branches:
       - 1.3.x
       - 1.4.x
+      labels:
+      - Backport
       ignore_conflicts: true
       label_conflicts: bp-conflict
     label:
@@ -53,18 +57,13 @@ pull_request_rules:
       - 1.2.x
       - 1.3.x
       - 1.4.x
+      labels:
+      - Backport
       ignore_conflicts: true
       label_conflicts: bp-conflict
     label:
       add:
       - Backported
-- name: label Mergify backport PR
-  conditions:
-  - title~=\(bp \#\d+\)
-  actions:
-    label:
-      add:
-      - Backport
 - name: automatic squash-and-mege of 1.2.x backport PRs
   conditions:
   - status-success=all tests passed
-- 
cgit v1.2.3