Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

backport: Add 7.16 branch #28560

Merged
merged 4 commits into from
Oct 20, 2021
Merged

backport: Add 7.16 branch #28560

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
09ced10
chore: add-backport-next
elasticmachine Oct 20, 2021
7384901
There will be no 7.17
andresrc Oct 20, 2021
135e243
Missing change
andresrc Oct 20, 2021
41e2ec1
Let's move to mergify
andresrc Oct 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .backportrc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"upstream": "elastic/beats",
"branches": [ { "name": "7.x", "checked": true }, "7.15", "7.14" ],
"branches": [ { "name": "7.x", "checked": true }, "7.16", "7.15", "7.14" ],
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AFAIK the 7.x branch will be renamed to 7.16, so no 7.x will exists anymore.

"labels": ["backport"],
"autoAssign": true,
"prTitle": "Cherry-pick to {targetBranch}: {commitMessages}"
Expand Down
15 changes: 14 additions & 1 deletion .mergify.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ pull_request_rules:
- name: backport patches to 7.x branch
conditions:
- merged
- label=backport-v7.16.0
- label=backport-v7.17.0
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ruflin @v1v I will revert this part

actions:
backport:
assignees:
Expand Down Expand Up @@ -163,3 +163,16 @@ pull_request_rules:
labels:
- "backport"
title: "[{{ destination_branch }}](backport #{{ number }}) {{ title }}"
- name: backport patches to 7.16 branch
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ruflin @v1v we keep this addition to handle dangling PRs after FF

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this depends on the above if we "rename" branches from 7.x to 7.16 or if we branch off 7.16 and delete 7.x? I don't know what Github will do with the dangling PR's. In case of doubt, I would keep it.

conditions:
- merged
- label=backport-v7.16.0
actions:
backport:
assignees:
- "{{ author }}"
branches:
- "7.16"
labels:
- "backport"
title: "[{{ destination_branch }}](backport #{{ number }}) {{ title }}"