Enable backport automation with mergify #143
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,31 @@ | ||||||
| pull_request_rules: | ||||||
| - name: ask to resolve conflict | ||||||
| conditions: | ||||||
| - conflict | ||||||
| actions: | ||||||
| comment: | ||||||
| message: | | ||||||
| This pull request is now in conflicts. Could you fix it @{{author}}? 🙏 | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| 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}} | ||||||
| ``` | ||||||
| - name: backport patches to 7.x branch | ||||||
| conditions: | ||||||
| - base=master | ||||||
| - label=v7.13.0 | ||||||
|
There was a problem hiding this comment. We will need some automation in the future to bump the version when required There was a problem hiding this comment. Just so I am sure I understand how this works. If we set the There was a problem hiding this comment. Exactly, but only when it gets merged. To illustrate the above, please see the below example for one of the repositories where this service is configured:
|
||||||
| actions: | ||||||
| backport: | ||||||
| branches: | ||||||
| - 7.x | ||||||
| - name: backport patches to 7.12 branch | ||||||
| conditions: | ||||||
| - base=master | ||||||
| - label=v7.12.0 | ||||||
| actions: | ||||||
| backport: | ||||||
| branches: | ||||||
| - 7.12 | ||||||
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.
authorwon't be resolved correctly -> Mergifyio/mergify#1096There 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.
See v1v/apm-pipeline-library#19 (comment)