Skip to content

Remove increment_build_number from macOS hotfix branch prep#67

Merged
ayoy merged 3 commits intomainfrom
dominik/update-hotfix
Mar 25, 2026
Merged

Remove increment_build_number from macOS hotfix branch prep#67
ayoy merged 3 commits intomainfrom
dominik/update-hotfix

Conversation

@ayoy
Copy link
Copy Markdown
Contributor

@ayoy ayoy commented Mar 24, 2026

Task/Issue URL: https://app.asana.com/1/137249556945/project/1203301625297703/task/1213798709649793

Description

Remove the increment_build_number call from prepare_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?

  • macOS hotfix workflows that previously relied on increment_build_number being called during branch preparation would need to handle build number incrementing separately. This is expected and intentional.

Quality Considerations

  • Corresponding test expectations have been updated to reflect the removal
  • No other callers of increment_build_number are affected

Generated with Claude Code


Note

Medium Risk
Medium risk because it changes release automation behavior for macOS hotfixes and updates the prepare_hotfix_branch API, 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_branch drops the increment_build_number step and removes its options parameter.

StartNewReleaseAction and the associated specs are updated to match the new helper signature/behavior, and the plugin version is bumped to 4.1.0.

Written by Cursor Bugbot for commit aa38cc1. This will update automatically on new commits. Configure here.

ayoy and others added 2 commits March 24, 2026 22:06
Build number incrementing is no longer needed as part of hotfix
branch preparation.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Copy link
Copy Markdown

@cursor cursor Bot left a comment

Choose a reason for hiding this comment

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

Cursor Bugbot has reviewed your changes and found 1 potential issue.

Fix All in Cursor

Bugbot Autofix prepared a fix for the issue found in the latest run.

  • ✅ Fixed: Unused options parameter after removing its only consumer
    • I removed the unused options parameter from prepare_hotfix_branch and updated all call sites and related specs to match the new signature.

Create PR

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)

update_version_config(new_version, other_action)
end
other_action.push_to_git_remote
increment_build_number(platform, options, other_action) if platform == "macos"
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

This will now be called directly from macos_build_hotfix_release.yml

@ayoy ayoy requested a review from alessandroboron March 24, 2026 22:05
@ayoy ayoy changed the title Remove increment_build_number from hotfix branch prep Remove increment_build_number from macOS hotfix branch prep Mar 24, 2026
Copy link
Copy Markdown

@alessandroboron alessandroboron left a comment

Choose a reason for hiding this comment

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

LGTM!

@ayoy ayoy merged commit 37dd86f into main Mar 25, 2026
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants