search

ChromaticHQ / usher

Custom Robo commands for use on PHP projects.
https://packagist.org/packages/chromatic/usher
11 stars 6 forks source link

Update korthout/backport-action action to v3 #207

Closed renovate[bot] closed 1 month ago

renovate[bot] commented 3 months ago

Mend Renovate

This PR contains the following updates:

Package Type Update Change
korthout/backport-action action major v2 -> v3

Release Notes

korthout/backport-action (korthout/backport-action) ### [`v3`](https://togithub.com/korthout/backport-action/compare/v2...v3) [Compare Source](https://togithub.com/korthout/backport-action/compare/v2...v3)

Configuration

📅 Schedule: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 Automerge: Disabled by config. Please merge this manually once you are satisfied.

â™» Rebasing: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 Ignore: Close this PR and you won't be reminded about this update again.

This PR was generated by Mend Renovate. View the repository job log.

apotek commented 1 month ago

This introduces a "breaking change" but it's a manually breaking change (ie, changes the way certain options, selected during a manual run) might work.

I checked our code and we do not use the now deprecated detect_merge_method config option.

From the release notes:

[Breaking] Use merge method to cherry-pick by default by @korthout in #420

This release changes the default behavior of the action to determine which commits are cherry-picked. While this behavior change doesn't necessarily require changes to your workflow, it warrants a major version bump.

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.

For "Squash and merge", the action cherry-picks the squashed commit.
For "Rebase and merge", the action cherry-picks the rebased commits.
For "Merged as a merge commit", the action cherry-picks the commits from the pull request.

If you previously used the experimental detect_merge_method input, we suggest you remove it from your workflow. This experimental input has been deprecated and replaced by the cherry_picking input.

If you want to return to the previous behavior, you can set the cherry_picking input to pull_request_head.