Enable backport automation with mergify #143
Conversation
| actions: | ||
| comment: | ||
| message: | | ||
| This pull request is now in conflicts. Could you fix it @{{author}}? 🙏 |
There was a problem hiding this comment.
author won't be resolved correctly -> Mergifyio/mergify#1096
There was a problem hiding this comment.
| - 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 v7.13.0 on the PR, it will be auto backported?
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:
- Avoid cache gsutils temporary location apm-pipeline-library#994 contains the label
backport-to-7.x(that's what we are using in that particular repo), and was merged. - A mergify action was triggered -> https://github.com/elastic/apm-pipeline-library/runs/1920298071
- Avoid cache gsutils temporary location (bp #994) apm-pipeline-library#995 was created afterwards
💚 Build Succeeded
Expand to view the summary
Build stats
Test stats 🧪
Trends 🧪 |
| actions: | ||
| comment: | ||
| message: | | ||
| This pull request is now in conflicts. Could you fix it @{{author}}? 🙏 |
There was a problem hiding this comment.
| This pull request is now in conflicts. Could you fix it @{{author}}? 🙏 | |
| This pull request is now in conflicts. Could you fix it? 🙏 |
|
Looking forward to have this in! |
|
I'll proceed with the merge now, |
What does this PR do?
Enable backports with mergify for:
v7.13.0v7.12.0If any conflicts the PRs are created with the label
conflictin addition a comment will be added with the actions to be done in order to fix the conflicts locally and push to the branch.Why is it important?
Mergifyprovides different mechanism to interact with PRs and automate certain process.Some examples
Backports to 7.x -> elastic/apm-pipeline-library#995
Merges to master -> elastic/apm-pipeline-library#994
Issues
Actions
mergifyapp in this project.