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.

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

[mergify] backport automation to 7.x, 7.12 and 7.11 #24608

Merged
merged 8 commits into from
Apr 7, 2021
25 changes: 25 additions & 0 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
pull_request_rules:
- name: backport patches to 7.x branch
conditions:
- base=master
- label=backport-to-7.x
Copy link
Member Author

Choose a reason for hiding this comment

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

Labels to be agreed!

Copy link
Member

@sorenlouv sorenlouv Mar 18, 2021

Choose a reason for hiding this comment

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

I think we should use the existing labels like v7.13.0 so people don't have to duplicate them.

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes, I added a comment to remember we need to set the labels accordingly.

For the record, we have a WiP automation to apply the same labels across all the observability repositories, therefore it will be quite simple to apply a new label everywhere.

Copy link

Choose a reason for hiding this comment

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

I think we should use the existing labels like v7.13.0 so people don't have to duplicate them.

We backport too often after FF, sometimes right before release time leaving us with fixes that didn't make it into the release. From past experience we've been notoriously bad at telling which exact a fix/features is in. I think I would prefer to tell the target branch instead of the exact version.

actions:
backport:
branches:
- 7.x
- name: backport patches to 7.12 branch
conditions:
- base=master
- label=backport-to-7.12
Copy link
Member Author

Choose a reason for hiding this comment

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

Labels to be agreed

actions:
backport:
branches:
- 7.12
- name: backport patches to 7.11 branch
conditions:
- base=master
- label=backport-to-7.11
Copy link
Member Author

Choose a reason for hiding this comment

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

Labels to be agreed!

actions:
backport:
branches:
- 7.11