Skip to content

Commit 80e0b73

Browse files
Adds 8.16 branch to backport and mergify configuration. (#2861) (#2862)
(cherry picked from commit 7978a9a) # Conflicts: # .backportrc.json Co-authored-by: István Zoltán Szabó <[email protected]>
1 parent 55331d7 commit 80e0b73

File tree

2 files changed

+19
-1
lines changed

2 files changed

+19
-1
lines changed

.backportrc.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
{
22
"upstream": "elastic/stack-docs",
3+
<<<<<<< HEAD
34
"branches": ["8.15", "8.14", "8.13", "8.12", "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", "7.7", "7.6", "7.5", "7.4", "7.3", "7.2", "7.1", "7.0", "6.8", "6.7", "6.6", "6.5", "6.4", "6.3", "6.2", "6.1", "6.0", "5.6"],
5+
=======
6+
"branches": [{ "name": "8.x", "checked": true }, "8.16", "8.15", "8.14", "8.13", "8.12", "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", "7.7", "7.6", "7.5", "7.4", "7.3", "7.2", "7.1", "7.0", "6.8", "6.7", "6.6", "6.5", "6.4", "6.3", "6.2", "6.1", "6.0", "5.6"],
7+
>>>>>>> 7978a9a9 (Adds 8.16 branch to backport and mergify configuration. (#2861))
48
"labels": ["backport"]
59
}

.mergify.yml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,20 @@ pull_request_rules:
1515
git merge <remote-repo>/{{base}}
1616
git push <remote-repo> {{head}}
1717
```
18+
- name: backport patches to 8.17 branch
19+
conditions:
20+
- merged
21+
- base=main
22+
- label=backport-8.17
23+
actions:
24+
backport:
25+
assignees:
26+
- "{{ author }}"
27+
branches:
28+
- "8.x"
29+
title: "[{{ destination_branch }}] {{ title }} (backport #{{ number }})"
30+
labels:
31+
- backport
1832
- name: backport patches to 8.16 branch
1933
conditions:
2034
- merged
@@ -25,7 +39,7 @@ pull_request_rules:
2539
assignees:
2640
- "{{ author }}"
2741
branches:
28-
- "8.x"
42+
- "8.16"
2943
title: "[{{ destination_branch }}] {{ title }} (backport #{{ number }})"
3044
labels:
3145
- backport

0 commit comments

Comments
 (0)