[Breaking] Use merge method to cherry-pick by default #420
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
This will replace the experimental detect_merge_method input.
The experimental input is replaced with a new non-experimental input `cherry_picking`. This changes the behavior, as the new input has a different default behavior. From now on commits are cherry-picked based on the merge method by default. It's still possible to cherry-pick the commits from the pull request itself, by changing the cherry_picking input.
This experimental input is no longer used, as it is replaced by the non-experimental `cherry_picking` input. To avoid requiring workflow changes immediately, we can warn users about their usage of deprecated experimental inputs.
This input is removed and replaced by the non-experimental `cherry_picking` input.
A breaking changes was made, that requires us to bump the major version.
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.
Important
This is a breaking change in behavior. Workflow changes are not required but may be recommended. We will bump the major version in the upcoming release.
This pull request changes the default behavior of the action to determine which commits are cherry-picked.
Previously, the action cherry-picked the commits from the pull request. Specifically, those reachable from the pull request's head and not reachable from the pull request's base.
From now on, the action cherry-picks the commits based on the method used to merge the pull request by default.
This behavior was previously available via the experimental
detect_merge_methodinput, introduced in #399. This experimental input has been deprecated and removed from the documentation. Workflows that specify a value for a deprecated experimental input will see an additional warning in the logs. We recommend that users remove the experimentaldetect_merge_methodinput from their workflows.Users can return to the previous behavior by setting the
cherry_pickinginput topull_request_head. The new default behavior can be explicitly enabled by setting thecherry_pickinginput toauto.