GitHub Action to automatically create backport PRs#4678
Merged
waiting-for-dev merged 1 commit intosolidusio:masterfrom Oct 20, 2022
Merged
GitHub Action to automatically create backport PRs#4678waiting-for-dev merged 1 commit intosolidusio:masterfrom
waiting-for-dev merged 1 commit intosolidusio:masterfrom
Conversation
This commit integrates the backport-github-action [1] GitHub Action. It automatically creates PRs for the branches specified via labels on another PR. For instance, if a PR to master has the following labels: - Needs Backport - Needs Backport-v3.2 - Needs Backport-v3.1 It'll create two other PRs, cherry-picking the commits on v3.2 and v3.1 branches. The action is triggered whenever: - A PR with those labels is merged - A closed PR has those labels added After the action runs, the "parent" PR is updated with a status report, informing of any encountered error (e.g., merge conflicts). We've chosen this action over the Backporting [2] action because the former has support for PRs containing multiple commits, which corresponds to our current flow. At the same time, the latter only works with single-commit PRs. 1 - https://github.com/sqren/backport-github-action 2 - https://github.com/marketplace/actions/backporting
Member
|
|
spaghetticode
approved these changes
Oct 19, 2022
Member
spaghetticode
left a comment
spaghetticode
left a comment
There was a problem hiding this comment.
thanks @waiting-for-dev , this is super cool!
adammathys
approved these changes
Oct 19, 2022
7 tasks
Member
|
This is 💯 |
waiting-for-dev
added
the
changelog:repository
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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.
Summary
This commit integrates the backport-github-action GitHub Action.
It automatically creates PRs for the branches specified via labels on another PR. For instance, if a PR to master has the following labels:
It'll create two other PRs, cherry-picking the commits on v3.2 and v3.1 branches. The action is triggered whenever:
After the action runs, the "parent" PR is updated with a status report, informing of any encountered error (e.g., merge conflicts).
We've chosen this action over the Backporting action because the former has support for PRs containing multiple commits, which corresponds to our current flow. At the same time, the latter only works with single-commit PRs.
Checklist
Check out our PR guidelines for more details.
The following are mandatory for all PRs:
The following are not always needed (
cross them outif they are not):[ ] I have added automated tests to cover my changes.[ ] I have attached screenshots to demo visual changes.[ ] I have opened a PR to update the guides.[ ] I have updated the readme to account for my changes.