Remove increment_build_number from macOS hotfix branch prep#67
Merged
Conversation
Build number incrementing is no longer needed as part of hotfix branch preparation. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
There was a problem hiding this comment.
Cursor Bugbot has reviewed your changes and found 1 potential issue.
Bugbot Autofix prepared a fix for the issue found in the latest run.
- ✅ Fixed: Unused
optionsparameter after removing its only consumer- I removed the unused
optionsparameter fromprepare_hotfix_branchand updated all call sites and related specs to match the new signature.
- I removed the unused
Or push these changes by commenting:
@cursor push faa30458a8
Preview (faa30458a8)
diff --git a/lib/fastlane/plugin/ddg_apple_automation/actions/start_new_release_action.rb b/lib/fastlane/plugin/ddg_apple_automation/actions/start_new_release_action.rb
--- a/lib/fastlane/plugin/ddg_apple_automation/actions/start_new_release_action.rb
+++ b/lib/fastlane/plugin/ddg_apple_automation/actions/start_new_release_action.rb
@@ -19,7 +19,7 @@
if params[:is_hotfix]
release_branch_name, new_version = Helper::DdgAppleAutomationHelper.prepare_hotfix_branch(
- params[:github_token], params[:platform], other_action, options
+ params[:github_token], params[:platform], other_action
)
else
release_branch_name, new_version, show_update_embedded_warning = Helper::DdgAppleAutomationHelper.prepare_release_branch(
diff --git a/lib/fastlane/plugin/ddg_apple_automation/helper/ddg_apple_automation_helper.rb b/lib/fastlane/plugin/ddg_apple_automation/helper/ddg_apple_automation_helper.rb
--- a/lib/fastlane/plugin/ddg_apple_automation/helper/ddg_apple_automation_helper.rb
+++ b/lib/fastlane/plugin/ddg_apple_automation/helper/ddg_apple_automation_helper.rb
@@ -145,7 +145,7 @@
return release_branch_name, new_version, update_embedded_result
end
- def self.prepare_hotfix_branch(github_token, platform, other_action, options)
+ def self.prepare_hotfix_branch(github_token, platform, other_action)
latest_public_release = Helper::GitHelper.latest_release(Helper::GitHelper.repo_name, false, platform, github_token)
version = latest_public_release.tag_name
Helper::GitHubActionsHelper.set_output("last_release", version)
diff --git a/spec/ddg_apple_automation_helper_spec.rb b/spec/ddg_apple_automation_helper_spec.rb
--- a/spec/ddg_apple_automation_helper_spec.rb
+++ b/spec/ddg_apple_automation_helper_spec.rb
@@ -407,7 +407,6 @@
new_version = "1.0.1+#{platform}"
release_branch_name = "hotfix/#{platform}/1.0.1"
other_action = double("other_action")
- options = { some_option: "value" }
github_token = "github-token"
@client = double("Octokit::Client")
@@ -432,7 +431,7 @@
expect(other_action).to receive(:last_git_commit).and_return({ commit_hash: "abc123" })
result_branch, result_version = Fastlane::Helper::DdgAppleAutomationHelper.prepare_hotfix_branch(
- github_token, platform, other_action, options
+ github_token, platform, other_action
)
expect(result_branch).to eq(release_branch_name)
@@ -454,7 +453,6 @@
new_version = "1.0.1+#{platform}"
release_branch_name = "hotfix/#{platform}/1.0.1"
other_action = double("other_action")
- options = { some_option: "value" }
github_token = "github-token"
@client = double("Octokit::Client")
@@ -482,7 +480,7 @@
expect(other_action).to receive(:last_git_commit).and_return({ commit_hash: "abc123" })
result_branch, result_version = Fastlane::Helper::DdgAppleAutomationHelper.prepare_hotfix_branch(
- github_token, platform, other_action, options
+ github_token, platform, other_action
)
expect(result_branch).to eq(release_branch_name)
ayoy
commented
Mar 24, 2026
| update_version_config(new_version, other_action) | ||
| end | ||
| other_action.push_to_git_remote | ||
| increment_build_number(platform, options, other_action) if platform == "macos" |
Contributor
Author
There was a problem hiding this comment.
This will now be called directly from macos_build_hotfix_release.yml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.


Task/Issue URL: https://app.asana.com/1/137249556945/project/1203301625297703/task/1213798709649793
Description
Remove the
increment_build_numbercall fromprepare_hotfix_branch. This step was only executed for macOS hotfixes and is no longer needed as part of hotfix branch preparation.Also bumps the plugin version to 4.1.0.
Testing Steps
Verify that tests pass
Impact and Risks
Low
What could go wrong?
increment_build_numberbeing called during branch preparation would need to handle build number incrementing separately. This is expected and intentional.Quality Considerations
increment_build_numberare affectedGenerated with Claude Code
Note
Medium Risk
Medium risk because it changes release automation behavior for macOS hotfixes and updates the
prepare_hotfix_branchAPI, which could impact existing CI/lane callers if any are missed.Overview
Hotfix branch preparation no longer increments the build number for macOS:
DdgAppleAutomationHelper.prepare_hotfix_branchdrops theincrement_build_numberstep and removes itsoptionsparameter.StartNewReleaseActionand the associated specs are updated to match the new helper signature/behavior, and the plugin version is bumped to4.1.0.Written by Cursor Bugbot for commit aa38cc1. This will update automatically on new commits. Configure here.