From 787643d7b28898cc0cb2d91e483567503369d4c2 Mon Sep 17 00:00:00 2001 From: Karen Metts <35154725+karenzone@users.noreply.github.com> Date: Thu, 17 Oct 2024 13:51:17 -0400 Subject: [PATCH] Add 8.16 branch to backport and mergify configs (#1385) --- .backportrc.json | 2 +- .mergify.yml | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.backportrc.json b/.backportrc.json index 781a234b0..a6942f35f 100644 --- a/.backportrc.json +++ b/.backportrc.json @@ -1,7 +1,7 @@ { "repoOwner": "elastic", "repoName": "ingest-docs", - "targetBranchChoices": ["main", "8.x","8.15","8.14","8.13","8.12", "8.11", "8.10", "8.9", "8.8", "8.7", "8.6", "7.17"], + "targetBranchChoices": ["main", "8.x","8.16","8.15","8.14","8.13","8.12", "8.11", "8.10", "8.9", "8.8", "8.7", "8.6", "7.17"], "autoMerge": true, "autoMergeMethod": "squash", "branchLabelMapping": { diff --git a/.mergify.yml b/.mergify.yml index dc9f9b523..e0116854a 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -29,6 +29,20 @@ pull_request_rules: title: "[{{ destination_branch }}] {{ title }} (backport #{{ number }})" labels: - backport + - name: backport patches to 8.16 branch + conditions: + - merged + - base=main + - label=backport-8.16 + actions: + backport: + assignees: + - "{{ author }}" + branches: + - "8.16" + title: "[{{ destination_branch }}] {{ title }} (backport #{{ number }})" + labels: + - backport - name: backport patches to 8.15 branch conditions: - merged