From 14279bf74a0ae594a9b8dff8dbea6f3e89664cd7 Mon Sep 17 00:00:00 2001
From: Ankush Menat <ankush@frappe.io>
Date: Thu, 19 Oct 2023 15:39:05 +0530
Subject: [PATCH] ci: update ci config to consider v15 (#22822)

---
 .github/workflows/initiate_release.yml    |  2 +-
 .github/workflows/lock.yml                |  2 +-
 .github/workflows/patch-mariadb-tests.yml |  1 +
 .mergify.yml                              | 11 +++++++++++
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/initiate_release.yml b/.github/workflows/initiate_release.yml
index 0aa376b0dc..20bf9967ad 100644
--- a/.github/workflows/initiate_release.yml
+++ b/.github/workflows/initiate_release.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: ["13", "14"]
+        version: ["13", "14", "15"]
 
     steps:
       - uses: octokit/request-action@v2.x
diff --git a/.github/workflows/lock.yml b/.github/workflows/lock.yml
index bb90188c4c..72712c3d5f 100644
--- a/.github/workflows/lock.yml
+++ b/.github/workflows/lock.yml
@@ -18,4 +18,4 @@ jobs:
         with:
           github-token: ${{ github.token }}
           issue-inactive-days: 14
-          pr-inactive-days: 14
\ No newline at end of file
+          pr-inactive-days: 14
diff --git a/.github/workflows/patch-mariadb-tests.yml b/.github/workflows/patch-mariadb-tests.yml
index 4875e6f5df..5b95e152cb 100644
--- a/.github/workflows/patch-mariadb-tests.yml
+++ b/.github/workflows/patch-mariadb-tests.yml
@@ -134,6 +134,7 @@ jobs:
           }
 
           update_to_version 14
+          update_to_version 15
 
           echo "Updating to last commit"
           pgrep honcho | xargs kill
diff --git a/.mergify.yml b/.mergify.yml
index 0881dd591b..7c524c5e93 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -9,6 +9,7 @@ pull_request_rules:
           - author!=frappe-pr-bot
           - author!=mergify[bot]
         - or:
+          - base=version-16
           - base=version-15
           - base=version-14
           - base=version-13
@@ -71,3 +72,13 @@ pull_request_rules:
         assignees:
           - "{{ author }}"
 
+  - name: backport to version-15-hotfix
+    conditions:
+      - label="backport version-15-hotfix"
+    actions:
+      backport:
+        branches:
+          - version-15-hotfix
+        assignees:
+          - "{{ author }}"
+