Skip to content

Commit 6646400

Browse files
authored
mergify: support 8.19 and remove support 8.x (#17567)
1 parent 47d430d commit 6646400

File tree

2 files changed

+10
-29
lines changed

2 files changed

+10
-29
lines changed

.ci/Makefile

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,8 @@ define MERGIFY_TMPL
1616
- label=$(BACKPORT_LABEL)
1717
actions:
1818
backport:
19-
assignees:
20-
- "{{ author }}"
2119
branches:
2220
- "$(BRANCH)"
23-
labels:
24-
- "backport"
25-
title: "[{{ destination_branch }}] {{ title }} (backport #{{ number }})"
2621
endef
2722

2823
# Add mergify entry for the new backport label

.mergify.yml

Lines changed: 10 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ pull_request_rules:
3939
To fixup this pull request, you need to add the backport labels for the needed
4040
branches, such as:
4141
* `backport-8./d` is the label to automatically backport to the `8./d` branch. `/d` is the digit.
42-
* `backport-8.x` is the label to automatically backport to the `8.x` branch.
4342
* If no backport is necessary, please add the `backport-skip` label
4443
4544
- name: remove backport-skip label
@@ -50,14 +49,6 @@ pull_request_rules:
5049
remove:
5150
- backport-skip
5251

53-
- name: remove backport-8.x label if backport-skip is present
54-
conditions:
55-
- label~=^backport-skip
56-
actions:
57-
label:
58-
remove:
59-
- backport-8.x
60-
6152
- name: notify the backport has not been merged yet
6253
conditions:
6354
- -merged
@@ -70,21 +61,6 @@ pull_request_rules:
7061
message: |
7162
This pull request has not been merged yet. Could you please review and merge it @{{ assignee | join(', @') }}? 🙏
7263
73-
- name: backport patches to 8.x branch
74-
conditions:
75-
- merged
76-
- base=main
77-
- label=backport-8.x
78-
actions:
79-
backport:
80-
assignees:
81-
- "{{ author }}"
82-
branches:
83-
- "8.x"
84-
labels:
85-
- "backport"
86-
title: "[{{ destination_branch }}] {{ title }} (backport #{{ number }})"
87-
8864
- name: backport patches to 8.16 branch
8965
conditions:
9066
- merged
@@ -130,6 +106,16 @@ pull_request_rules:
130106
- "backport"
131107
title: "[{{ destination_branch }}] {{ title }} (backport #{{ number }})"
132108

109+
- name: backport patches to 8.19 branch
110+
conditions:
111+
- merged
112+
- base=main
113+
- label=backport-8.19
114+
actions:
115+
backport:
116+
branches:
117+
- "8.19"
118+
133119
- name: backport patches to 9.0 branch
134120
conditions:
135121
- merged

0 commit comments

Comments
 (0)