-
Notifications
You must be signed in to change notification settings - Fork 4.9k
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
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
da361cc
[mergify] backport automation to 7.x, 7.12 and 7.11
v1v edc1caa
Use current labels
v1v bab54e9
Add ask to resolve conflict with the how to
v1v 254b2dd
cosmetic change to validate the mergify
v1v 840d99a
quote the branches
v1v c1238b8
Merge remote-tracking branch 'upstream/master' into feature/mergify
v1v bf22c7e
[mergify] use the merged condition
v1v ff1eaca
Use backport-vMajor.Minor.0 labels for the experimental phase
v1v File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
actions: | ||
backport: | ||
branches: | ||
- 7.x | ||
- name: backport patches to 7.12 branch | ||
conditions: | ||
- base=master | ||
- label=backport-to-7.12 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Labels to be agreed! |
||
actions: | ||
backport: | ||
branches: | ||
- 7.11 |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Labels to be agreed!
There was a problem hiding this comment.
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.There was a problem hiding this comment.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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.