From ba9e87660f9df7a6d12d5e326005a194264131ee Mon Sep 17 00:00:00 2001
From: Janeen Mikell Roberts <57149392+jmikell821@users.noreply.github.com>
Date: Thu, 21 Nov 2024 12:17:43 -0500
Subject: [PATCH 1/2] Update .mergify.yml

Adds `8.x` mergify for `v.8.18.0` branch; updates previous `8.x` to target `8.17`.
---
 .mergify.yml | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/.mergify.yml b/.mergify.yml
index d23f89f7b6..b41e0fc5a3 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -26,6 +26,34 @@ pull_request_rules:
         branches:
           - "main"
         title: "[{{ destination_branch }}] {{ title }} (backport #{{ number }})"
+  - name: backport patches to 8.x branch
+    conditions:
+      - merged
+      - base=main
+      - label=v8.18.0
+    actions:
+      backport:
+        assignees:
+          - "{{ author }}"
+        branches:
+          - "8.x"
+        title: "[{{ destination_branch }}] {{ title }} (backport #{{ number }})"
+        labels:
+          - backport
+  - name: backport patches to 8.17 branch
+    conditions:
+      - merged
+      - base=main
+      - label=v8.17.0
+    actions:
+      backport:
+        assignees:
+          - "{{ author }}"
+        branches:
+          - "8.17"
+        title: "[{{ destination_branch }}] {{ title }} (backport #{{ number }})"
+        labels:
+          - backport
   - name: backport patches to 8.17 branch
     conditions:
       - merged

From cd3260936be82712bc13b24f8df91679f4056387 Mon Sep 17 00:00:00 2001
From: Janeen Mikell Roberts <57149392+jmikell821@users.noreply.github.com>
Date: Thu, 21 Nov 2024 12:21:21 -0500
Subject: [PATCH 2/2] Update .mergify.yml

Removes duplicate `8.17`backport in file.
---
 .mergify.yml | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index b41e0fc5a3..b547826c0d 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -54,20 +54,6 @@ pull_request_rules:
         title: "[{{ destination_branch }}] {{ title }} (backport #{{ number }})"
         labels:
           - backport
-  - name: backport patches to 8.17 branch
-    conditions:
-      - merged
-      - base=main
-      - label=v8.17.0
-    actions:
-      backport:
-        assignees:
-          - "{{ author }}"
-        branches:
-          - "8.x"
-        title: "[{{ destination_branch }}] {{ title }} (backport #{{ number }})"
-        labels:
-          - backport
   - name: backport patches to 8.16 branch
     conditions:
       - merged