From ae4e33efc9a2ca0c58b268720e23558f4380c7b3 Mon Sep 17 00:00:00 2001
From: Will Hickey <will.hickey@solana.com>
Date: Mon, 2 Oct 2023 12:31:06 -0500
Subject: [PATCH] Update mergify backport actions for new minor version
 (#33490)

---
 .mergify.yml | 52 ++++++++++++++++++++++++++--------------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index 1fca661dd..ab8147681 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -73,38 +73,14 @@ pull_request_rules:
           - automerge
       comment:
         message: automerge label removed due to a CI failure
-  - name: v1.14 feature-gate backport
-    conditions:
-      - label=v1.14
-      - label=feature-gate
-    actions:
-      backport:
-        assignees: &BackportAssignee
-          - "{{ merged_by|replace('mergify[bot]', label|select('equalto', 'community')|first|default(author)|replace('community', '@solana-labs/community-pr-subscribers')) }}"
-        title: "{{ destination_branch }}: {{ title }} (backport of #{{ number }})"
-        ignore_conflicts: true
-        labels:
-          - feature-gate
-        branches:
-          - v1.14
-  - name: v1.14 non-feature-gate backport
-    conditions:
-      - label=v1.14
-      - label!=feature-gate
-    actions:
-      backport:
-        assignees: *BackportAssignee
-        title: "{{ destination_branch }}: {{ title }} (backport of #{{ number }})"
-        ignore_conflicts: true
-        branches:
-          - v1.14
   - name: v1.16 feature-gate backport
     conditions:
       - label=v1.16
       - label=feature-gate
     actions:
       backport:
-        assignees: *BackportAssignee
+        assignees: &BackportAssignee
+          - "{{ merged_by|replace('mergify[bot]', label|select('equalto', 'community')|first|default(author)|replace('community', '@solana-labs/community-pr-subscribers')) }}"
         title: "{{ destination_branch }}: {{ title }} (backport of #{{ number }})"
         ignore_conflicts: true
         labels:
@@ -122,6 +98,30 @@ pull_request_rules:
         ignore_conflicts: true
         branches:
           - v1.16
+  - name: v1.17 feature-gate backport
+    conditions:
+      - label=v1.17
+      - label=feature-gate
+    actions:
+      backport:
+        assignees: *BackportAssignee
+        title: "{{ destination_branch }}: {{ title }} (backport of #{{ number }})"
+        ignore_conflicts: true
+        labels:
+          - feature-gate
+        branches:
+          - v1.17
+  - name: v1.17 non-feature-gate backport
+    conditions:
+      - label=v1.17
+      - label!=feature-gate
+    actions:
+      backport:
+        assignees: *BackportAssignee
+        title: "{{ destination_branch }}: {{ title }} (backport of #{{ number }})"
+        ignore_conflicts: true
+        branches:
+          - v1.17
 
 commands_restrictions:
   # The author of copied PRs is the Mergify user.