From 825f319d513bb31c5df30079879b086c9a14783d Mon Sep 17 00:00:00 2001 From: benironside <91905639+benironside@users.noreply.github.com> Date: Tue, 3 Oct 2023 15:00:39 -0700 Subject: [PATCH] Updates the backport and mergify config to include 8.11 branch --- .backportrc.json | 2 +- .mergify.yml | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.backportrc.json b/.backportrc.json index 2d979ccb66..7556371909 100644 --- a/.backportrc.json +++ b/.backportrc.json @@ -1,5 +1,5 @@ { "upstream": "elastic/security-docs", - "branches": [{ "name": "7.x", "checked": true }, "8.10", "8.9", "8.8", "8.7", "8.6", "8.5", "8.4", "8.3", "8.2", "8.1", "8.0", "7.17", "7.16", "7.15", "7.14", "7.13", "7.12", "7.11", "7.10", "7.9", "7.8"], + "branches": [{ "name": "7.x", "checked": true }, "8.11", "8.10", "8.9", "8.8", "8.7", "8.6", "8.5", "8.4", "8.3", "8.2", "8.1", "8.0", "7.17", "7.16", "7.15", "7.14", "7.13", "7.12", "7.11", "7.10", "7.9", "7.8"], "labels": ["backport"] } diff --git a/.mergify.yml b/.mergify.yml index 583cdc99d5..54e73f126c 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -13,6 +13,20 @@ pull_request_rules: git merge upstream/{{base}} git push upstream {{head}} ``` + - name: backport patches to 8.11 branch + conditions: + - merged + - base=main + - label=v8.11.0 + actions: + backport: + assignees: + - "{{ author }}" + branches: + - "8.11" + title: "[{{ destination_branch }}] {{ title }} (backport #{{ number }})" + labels: + - backport - name: backport patches to 8.10 branch conditions: - merged