From 87bb0cc3c05f0aea103a0abec9e6b6dcff6050ad Mon Sep 17 00:00:00 2001 From: Jack Koenig Date: Thu, 15 Apr 2021 11:20:37 -0700 Subject: Improve Mergify labeling of backports (#1865) Using https://github.com/ucb-bar/chisel-repo-tools/pull/31--- .mergify.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index 38d5ad17..d3534b36 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -22,6 +22,8 @@ pull_request_rules: backport: branches: - 3.4.x + labels: + - Backport ignore_conflicts: true label_conflicts: bp-conflict label: @@ -37,6 +39,8 @@ pull_request_rules: branches: - 3.3.x - 3.4.x + labels: + - Backport ignore_conflicts: true label_conflicts: bp-conflict label: @@ -53,18 +57,13 @@ pull_request_rules: - 3.2.x - 3.3.x - 3.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 3.2.x backport PRs conditions: - status-success=all tests passed -- cgit v1.2.3