Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump korthout/backport-action from 2 to 3 #436

Merged

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Jun 1, 2024

Bumps korthout/backport-action from 2 to 3.

Release notes

Sourced from korthout/backport-action's releases.

Backport-action v3.0.0

Changed

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.

This behavior was previously available via the experimental detect_merge_method input, introduced in korthout/backport-action#399. Special thanks go out to @​jschmid1 for contributing this feature.

Added

This release also adds two new experimental features. Special shoutouts to @​tasso94 and @​vermz99 for contributing these!

With the experimental downstream_repo and downstream_owner inputs, you can backport to a repository other than where the workflow runs. For example, when you use a fork to maintain the previously released versions. You can also see this as backporting to a remote repository, but we felt it was better described as backporting to a downstream repository. The default behavior remains that the action always backports to the repository in which the workflow runs.

With the experimental conflict_resolution input, you can now change how the action will handle conflicts during cherry-picking. Set it to draft_commit_conflicts to create a draft pull request with the first conflict encountered committed to reduce some of the manual efforts in backporting. The default behavior stays like before and can be configured explicitly as fail. In that case, the backport fails when the cherry-pick encounters a conflict.

Updated Dependencies

New Contributors

Full Changelog: korthout/backport-action@v2.5.0...v3.0.0

Backport-action v2.5.0

What's Changed

Updated Dependencies

New Contributors

... (truncated)

Commits
  • bd410d3 dist: release 3.0.2
  • 7e34d5f dist: build new artifacts
  • 9237785 Merge pull request #423 from korthout/korthout-fix-draft-checkout
  • 8fef44e fix: checkout branch not target
  • f73aeb9 dist: release 3.1.0-SNAPSHOT
  • ecb5bc3 dist: release 3.0.1
  • c7a7132 dist: build new artifacts
  • da478f7 Merge pull request #422 from korthout/korthout-fix-draft-conflict-suggestions
  • 863937d fix: fetch and checkout draft pr branch directly
  • 7d390fd dist: release 3.1.0-SNAPSHOT
  • Additional commits viewable in compare view

Dependabot compatibility score

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

Bumps [korthout/backport-action](https://github.com/korthout/backport-action) from 2 to 3.
- [Release notes](https://github.com/korthout/backport-action/releases)
- [Commits](korthout/backport-action@v2...v3)

---
updated-dependencies:
- dependency-name: korthout/backport-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
@dependabot dependabot bot requested a review from a team as a code owner June 1, 2024 01:44
@dependabot dependabot bot added the dependencies Pull requests that update a dependency file label Jun 1, 2024
@GoliathLabs GoliathLabs merged commit 843ad59 into main Jun 1, 2024
3 checks passed
@GoliathLabs GoliathLabs deleted the dependabot/github_actions/korthout/backport-action-3 branch June 1, 2024 01:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies Pull requests that update a dependency file
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant