A failed backport should not prevent the next backport #221
Conversation
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
Resets the state after a failed cherry-pick so that one failed backport does not prevent the next backport.
lenaschoenburg
changed the title
korthout
approved these changes
Jan 27, 2022
There was a problem hiding this comment.
Thanks @oleschoenburg! Great find and I like the solution 🥇
🙇 Would you be up to write a test for it in https://github.com/korthout/backport-action-test?
|
@korthout Thanks! I'll try to add a test there but it's probably going to take me while to get to it. |
|
@oleschoenburg this is still a pretty new testing approach for me. So it's not fully worked out and documented yet. Let me know when you'd like to spend some time on it then I can show you around. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
When cherry-picking commits for one backport target fails, for example due to merge conflicts, the next backport will also fail because git is still in the cherry-picking state. When we abort the cherry-picking, the next backport might succeed which is a nice usability improvement.
Here is an example where this would have helped: https://github.com/camunda-cloud/zeebe/runs/4964915003?check_suite_focus=true
Alternatives
We could also consider doing a
git resetbetween every backport.