-
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 all commits
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,42 @@ | ||
| pull_request_rules: | ||
| - name: backport patches to 7.x branch | ||
| conditions: | ||
| - merged | ||
| - base=master | ||
| - label=backport-v7.13.0 | ||
| actions: | ||
| backport: | ||
| branches: | ||
| - "7.x" | ||
| - name: backport patches to 7.12 branch | ||
| conditions: | ||
| - merged | ||
| - base=master | ||
| - label=backport-v7.12.0 | ||
| actions: | ||
| backport: | ||
| branches: | ||
| - "7.12" | ||
| - name: backport patches to 7.11 branch | ||
| conditions: | ||
| - merged | ||
| - base=master | ||
| - label=backport-v7.11.0 | ||
| actions: | ||
| backport: | ||
| branches: | ||
| - "7.11" | ||
| - name: ask to resolve conflict | ||
| conditions: | ||
| - conflict | ||
| actions: | ||
| comment: | ||
| message: | | ||
| This pull request is now in conflicts. Could you fix it? 🙏 | ||
| To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/ | ||
| ``` | ||
| git fetch upstream | ||
| git checkout -b {{head}} upstream/{{head}} | ||
| git merge upstream/{{base}} | ||
| git push upstream {{head}} | ||
| ``` | ||
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.
Wouldn't it be easier to ask the user to use a tool for this? Either running mergify locally or backport.
In Kibana we help the user like this:
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.
good point. I don't know what's the tool the team have in place for that, in order to be be tool-agnostic the message provides the git commands to solve it locally.
I'll keep a note to iterate on this and make the user experience smooth. Thanks for the feedback :)
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.
Most people use the
dev-tools/cherry-pick-prtool in the Beats repo it seems. But a few contributors use the nodejs backport tool. Both are supported. For the changelog we have a 'requirement' on the PR title to properly link to the original PR, so we can find unique PRs and double check if these features are really released (github tags can be missleading). Both tools are supported by our changelog scripts. Using custom git commands might be a problem if the title is not properly formatted (unless we add another lint check on the PR title for backports).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 can then iterate with the existing tools, the current comment intends to help with fixing the just created backport PR that has got some conflicts, so we might need to think about that particular use case. I'll keep a note for the upcoming iterations