Skip to content

[AINFRA-1406] Fix deletion of intermediate branch if nothing to backmerge #665

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.

Sign up for GitHub

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

Merged
AliSoftware merged 2 commits into from
Oct 14, 2025
Merged

[AINFRA-1406] Fix deletion of intermediate branch if nothing to backmerge #665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0358f1c
switch out of intermediate branch before deleting it
AliSoftware Oct 13, 2025
614f055
Add CHANGELOG entry
AliSoftware Oct 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ _None_

### Bug Fixes

_None_
- Fix a bug in `create_release_backmerge_pull_request` when you pass a `intermediate_branch_created_callback` callback but there's ultimately nothing to merge. [#665]

### Internal Changes

Expand Down
1 change: 1 addition & 0 deletions ...e/plugin/wpmreleasetoolkit/actions/common/create_release_backmerge_pull_request_action.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ def self.create_backmerge_pr(api_url:, token:, repository:, title:, head_branch:
# When a callback was provided, do the pre-check about valid PR _only_ at that point, in case the callback added new commits
unless can_merge?(intermediate_branch, into: base_branch)
UI.error("Nothing to merge from #{intermediate_branch} into #{base_branch}. Skipping PR creation.")
Action.sh('git', 'checkout', head_branch) # Switch to original branch so we can delete the intermediate branch
Fastlane::Helper::GitHelper.delete_local_branch_if_exists!(intermediate_branch)
return nil
end
Expand Down