From 6bd8cb1bb20611c67ad845d3d1478aebf2abf3dd Mon Sep 17 00:00:00 2001
From: Victor Martinez <VictorMartinezRubio@gmail.com>
Date: Mon, 9 Sep 2024 21:42:48 +0200
Subject: [PATCH 1/3] mergify: support for backport-major.minor

---
 .mergify.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index 4f9e135a0a7..75fc54ac098 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -146,7 +146,7 @@ pull_request_rules:
 
           To fixup this pull request, you need to add the backport labels for the needed
           branches, such as:
-          * `backport-v8./d.0` is the label to automatically backport to the `8./d` branch. `/d` is the digit
+          * `backport-8./d` is the label to automatically backport to the `8./d` branch. `/d` is the digit
   - name: notify the backport has not been merged yet
     conditions:
       - -merged
@@ -162,7 +162,7 @@ pull_request_rules:
   - name: backport patches to 7.17 branch
     conditions:
       - merged
-      - label=backport-v7.17.0
+      - label ~= ^(backport-v7.17.0|backport-7.17)$
     actions:
       backport:
         assignees:
@@ -331,7 +331,7 @@ pull_request_rules:
   - name: backport patches to 8.15 branch
     conditions:
       - merged
-      - label=backport-v8.15.0
+      - label ~= ^(backport-v8.15.0|backport-8.15)$
     actions:
       backport:
         assignees:
@@ -344,7 +344,7 @@ pull_request_rules:
   - name: backport patches to 8.x branch
     conditions:
       - merged
-      - label=backport-v8.x
+      - label=backport-8.x
     actions:
       backport:
         assignees:

From 7a56ab341cce33243672cf6c41e7bcf44dd922ce Mon Sep 17 00:00:00 2001
From: Victor Martinez <victormartinezrubio@gmail.com>
Date: Mon, 9 Sep 2024 22:59:05 +0200
Subject: [PATCH 2/3] avoid spaces

---
 .mergify.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index 75fc54ac098..2373e5ba67c 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -162,7 +162,7 @@ pull_request_rules:
   - name: backport patches to 7.17 branch
     conditions:
       - merged
-      - label ~= ^(backport-v7.17.0|backport-7.17)$
+      - label~=^(backport-v7.17.0|backport-7.17)$
     actions:
       backport:
         assignees:
@@ -331,7 +331,7 @@ pull_request_rules:
   - name: backport patches to 8.15 branch
     conditions:
       - merged
-      - label ~= ^(backport-v8.15.0|backport-8.15)$
+      - label~=^(backport-v8.15.0|backport-8.15)$
     actions:
       backport:
         assignees:

From 93ac66c060bb39ed4e7a0fd3d1caca8e21ffa3c6 Mon Sep 17 00:00:00 2001
From: Victor Martinez <VictorMartinezRubio@gmail.com>
Date: Tue, 10 Sep 2024 13:22:49 +0200
Subject: [PATCH 3/3] support previous format

---
 .mergify.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index 08bf630a726..81093ee7bd3 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -148,7 +148,7 @@ pull_request_rules:
           branches, such as:
           * `backport-8./d` is the label to automatically backport to the `8./d` branch. `/d` is the digit
 
-          **NOTE**: `backport-v8.x` has been added to help with the transition to the new branch 8.x.
+          **NOTE**: `backport-8.x` has been added to help with the transition to the new branch 8.x.
       label:
         add:
           - backport-8.x
@@ -349,7 +349,7 @@ pull_request_rules:
   - name: backport patches to 8.x branch
     conditions:
       - merged
-      - label=backport-8.x
+      - label~=^(backport-v8.x|backport-8.x)$
     actions:
       backport:
         assignees: