Skip to content

build(deps): bump korthout/backport-action from 4.7.0 to 4.7.1 - #129

Open
dependabot[bot] wants to merge 1 commit into
mainfrom
dependabot/github_actions/korthout/backport-action-4.7.1
Open

dependabot[bot] wants to merge 1 commit into
mainfrom
dependabot/github_actions/korthout/backport-action-4.7.1

Conversation

@dependabot

@dependabot dependabot Bot commented on behalf of github Nov 9, 2026

Copy link
Copy Markdown
Contributor

Bumps korthout/backport-action from 4.7.0 to 4.7.1.

Release notes

Sourced from korthout/backport-action's releases.

Backport-action v4.7.1

What's Changed

Thanks to a contribution by @​jrasm91, backports no longer fail when you combine auto_merge_enabled: true with experimental.conflict_resolution: draft_commit_conflicts. Previously, when a cherry-pick conflicted, the action created the draft backport pull request and then tried to enable auto-merge on it. GitHub doesn't allow auto-merging of drafts, so the backport was reported as an unexpected failure, was_successful was false, and the draft backport pull request didn't receive instructions on how to resolve the conflict.

Now the action doesn't attempt auto-merge on a draft backport pull request and logs it. The backport is reported as drafted with conflicts, and the draft receives the conflict-resolution instructions as usual. With comment_style: summary, that looks like this:

Target Status
stable/8.7 ⚠️ Drafted with conflicts #612

Auto-merge stays off for the draft. You can enable it once you've resolved the conflicts.

New Contributors

Updated dependencies

Maintenance changes

Full Changelog: korthout/backport-action@v4.7.0...v4.7.1

Commits
  • 0ebd44f dist: release 4.7.1
  • a4743eb dist: build new artifacts
  • f3f9f88 Merge pull request #797 from korthout/backport-793-to-release-v4
  • 029c104 Assert auto-merge on the created draft pull request
  • 909abe7 Document skipped auto-merge under draft_commit_conflicts
  • 3a3b0ef Log when auto-merge is skipped for a draft pull request
  • b5e4f7d Use GitHub's draft state to decide on auto-merge
  • 35c3295 Reject auto-merge on draft pull requests in FakeGithub
  • 114b28a fix: skip auto merge on draft prs
  • 77f37c7 Merge pull request #787 from korthout/backport-786-to-release-v4
  • 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 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 4.7.0 to 4.7.1.
- [Release notes](https://github.com/korthout/backport-action/releases)
- [Commits](korthout/backport-action@v4.7.0...v4.7.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot dependabot Bot added dependencies Pull requests that update a dependency file github_actions Pull requests that update GitHub Actions code labels Nov 9, 2026
@cursor

cursor Bot commented Nov 9, 2026 •

Copy link
Copy Markdown

PR Summary

Low Risk
Single-version CI dependency bump with no application code changes; the patch improves draft conflict backport behavior.

Overview
Bumps korthout/backport-action in the backport workflow from v4.7.0 to v4.7.1.

That release fixes backports when experimental.conflict_resolution: draft_commit_conflicts is used (as in this workflow): conflicting cherry-picks no longer fail because the action tried to auto-merge a draft PR. Draft backports with conflicts are reported correctly and still get conflict-resolution instructions.

Reviewed by Cursor Bugbot for commit 8b8cb65. Bugbot is set up for automated code reviews on this repo. Configure here.

@github-actions github-actions Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This Dependabot patch bumps korthout/backport-action from v4.7.0 to v4.7.1. The release only fixes a bug: the action no longer tries to enable auto-merge on draft backport PRs. Nothing in this change needs fixing, and it is safe to merge.

Findings: 0 blocking | 1 non-blocking | 0 posted inline

Blockers

  • None at the file/PR level.

Non-blocking

  • None at the file/PR level.
  • 1 non-blocking pre-existing issue(s) listed below under pre-existing issues.

Pre-existing issues

  • [suggestion] .github/workflows/backport.yml pins third-party actions by mutable tag (korthout/backport-action@v4.x, actions/checkout@v7) instead of by commit SHA. This step runs with an app-generated token, so a retagged upstream release could run with elevated permissions. Consider pinning to full commit SHAs, with the version noted in a comment.

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 github_actions Pull requests that update GitHub Actions code

Projects

None yet

Development

Successfully merging this pull request may close these issues.

0 participants