diff --git a/.backportrc.json b/.backportrc.json index 3a61acaf3..24ccaa6b7 100644 --- a/.backportrc.json +++ b/.backportrc.json @@ -1,7 +1,7 @@ { "repoOwner": "elastic", "repoName": "ingest-docs", - "targetBranchChoices": ["main", "8.14","8.13","8.12", "8.11", "8.10", "8.9", "8.8", "8.7", "8.6", "7.17"], + "targetBranchChoices": ["main", "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 b209cd9f6..fe6908453 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -15,6 +15,20 @@ pull_request_rules: git merge /{{base}} git push {{head}} ``` + - name: backport patches to 8.15 branch + conditions: + - merged + - base=main + - label=backport-8.15 + actions: + backport: + assignees: + - "{{ author }}" + branches: + - "8.15" + title: "[{{ destination_branch }}] {{ title }} (backport #{{ number }})" + labels: + - backport - name: backport patches to 8.14 branch conditions: - merged