mirror of
https://github.com/elastic/logstash.git
synced 2025-06-27 17:08:55 -04:00
mergify: support 8.19 and remove support 8.x (#17567)
This commit is contained in:
parent
47d430d4fb
commit
6646400637
2 changed files with 10 additions and 29 deletions
|
@ -16,13 +16,8 @@ define MERGIFY_TMPL
|
||||||
- label=$(BACKPORT_LABEL)
|
- label=$(BACKPORT_LABEL)
|
||||||
actions:
|
actions:
|
||||||
backport:
|
backport:
|
||||||
assignees:
|
|
||||||
- "{{ author }}"
|
|
||||||
branches:
|
branches:
|
||||||
- "$(BRANCH)"
|
- "$(BRANCH)"
|
||||||
labels:
|
|
||||||
- "backport"
|
|
||||||
title: "[{{ destination_branch }}] {{ title }} (backport #{{ number }})"
|
|
||||||
endef
|
endef
|
||||||
|
|
||||||
# Add mergify entry for the new backport label
|
# Add mergify entry for the new backport label
|
||||||
|
|
34
.mergify.yml
34
.mergify.yml
|
@ -39,7 +39,6 @@ pull_request_rules:
|
||||||
To fixup this pull request, you need to add the backport labels for the needed
|
To fixup this pull request, you need to add the backport labels for the needed
|
||||||
branches, such as:
|
branches, such as:
|
||||||
* `backport-8./d` is the label to automatically backport to the `8./d` branch. `/d` is the digit.
|
* `backport-8./d` is the label to automatically backport to the `8./d` branch. `/d` is the digit.
|
||||||
* `backport-8.x` is the label to automatically backport to the `8.x` branch.
|
|
||||||
* If no backport is necessary, please add the `backport-skip` label
|
* If no backport is necessary, please add the `backport-skip` label
|
||||||
|
|
||||||
- name: remove backport-skip label
|
- name: remove backport-skip label
|
||||||
|
@ -50,14 +49,6 @@ pull_request_rules:
|
||||||
remove:
|
remove:
|
||||||
- backport-skip
|
- backport-skip
|
||||||
|
|
||||||
- name: remove backport-8.x label if backport-skip is present
|
|
||||||
conditions:
|
|
||||||
- label~=^backport-skip
|
|
||||||
actions:
|
|
||||||
label:
|
|
||||||
remove:
|
|
||||||
- backport-8.x
|
|
||||||
|
|
||||||
- name: notify the backport has not been merged yet
|
- name: notify the backport has not been merged yet
|
||||||
conditions:
|
conditions:
|
||||||
- -merged
|
- -merged
|
||||||
|
@ -70,21 +61,6 @@ pull_request_rules:
|
||||||
message: |
|
message: |
|
||||||
This pull request has not been merged yet. Could you please review and merge it @{{ assignee | join(', @') }}? 🙏
|
This pull request has not been merged yet. Could you please review and merge it @{{ assignee | join(', @') }}? 🙏
|
||||||
|
|
||||||
- name: backport patches to 8.x branch
|
|
||||||
conditions:
|
|
||||||
- merged
|
|
||||||
- base=main
|
|
||||||
- label=backport-8.x
|
|
||||||
actions:
|
|
||||||
backport:
|
|
||||||
assignees:
|
|
||||||
- "{{ author }}"
|
|
||||||
branches:
|
|
||||||
- "8.x"
|
|
||||||
labels:
|
|
||||||
- "backport"
|
|
||||||
title: "[{{ destination_branch }}] {{ title }} (backport #{{ number }})"
|
|
||||||
|
|
||||||
- name: backport patches to 8.16 branch
|
- name: backport patches to 8.16 branch
|
||||||
conditions:
|
conditions:
|
||||||
- merged
|
- merged
|
||||||
|
@ -130,6 +106,16 @@ pull_request_rules:
|
||||||
- "backport"
|
- "backport"
|
||||||
title: "[{{ destination_branch }}] {{ title }} (backport #{{ number }})"
|
title: "[{{ destination_branch }}] {{ title }} (backport #{{ number }})"
|
||||||
|
|
||||||
|
- name: backport patches to 8.19 branch
|
||||||
|
conditions:
|
||||||
|
- merged
|
||||||
|
- base=main
|
||||||
|
- label=backport-8.19
|
||||||
|
actions:
|
||||||
|
backport:
|
||||||
|
branches:
|
||||||
|
- "8.19"
|
||||||
|
|
||||||
- name: backport patches to 9.0 branch
|
- name: backport patches to 9.0 branch
|
||||||
conditions:
|
conditions:
|
||||||
- merged
|
- merged
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue