search

fluxcd / helm-controller

The GitOps Toolkit Helm reconciler, for declarative Helming
https://fluxcd.io
Apache License 2.0
414 stars 163 forks source link

Bump korthout/backport-action from 2.5.0 to 3.0.0 in the ci group #995

Closed dependabot[bot] closed 6 months ago

dependabot[bot] commented 6 months ago

Bumps the ci group with 1 update: korthout/backport-action.

Updates korthout/backport-action from 2.5.0 to 3.0.0

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: https://github.com/korthout/backport-action/compare/v2.5.0...v3.0.0

Commits
  • 7e7cb19 dist: release 3.0.0
  • 5ff61e2 Merge pull request #420 from korthout/korthout-elevate-detect-merge-method-input
  • 54c4bc6 dist: bump major version to v3
  • 206c831 dist: build new version
  • 79c8bf7 docs: remove deprecated detect_merge_method input
  • 0d9e567 feat: deprecate experimental detect_merge_method
  • f63ddf8 breaking: change default cherry-picked commits
  • a9da7bc docs: clarify how commits are cherry-picked
  • a3c2461 feat: introduce cherry_picking input
  • 8e95300 Merge pull request #417 from vermz99/main
  • 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 ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore major version` will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself) - `@dependabot ignore minor version` will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself) - `@dependabot ignore ` will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself) - `@dependabot unignore ` will remove all of the ignore conditions of the specified dependency - `@dependabot unignore ` will remove the ignore condition of the specified dependency and ignore conditions
dependabot[bot] commented 6 months ago

Looks like korthout/backport-action is updatable in another way, so this is no longer needed.