release branch rename

duckduckgo · Jan 17, 2025 · d6f3e11 · d6f3e11
1 parent 1b382a1
commit d6f3e11
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/lib/fastlane/plugin/ddg_apple_automation/actions/tag_release_action.rb b/lib/fastlane/plugin/ddg_apple_automation/actions/tag_release_action.rb
@@ -34,11 +34,10 @@ def self.setup_constants(platform)
       end
 
       def self.run(params)
-        other_action.ensure_git_branch(branch: "^.+(release|hotfix)/.+$")
+        platform = params[:platform] || Actions.lane_context[Actions::SharedValues::PLATFORM_NAME]
+        other_action.ensure_git_branch(branch: "^.+(release|hotfix)/#{platform}/.+$")
         Helper::GitHelper.setup_git_user
-
-        params[:platform] ||= Actions.lane_context[Actions::SharedValues::PLATFORM_NAME]
-        setup_constants(params[:platform])
+        setup_constants(platform)
 
         tag_and_release_output = create_tag_and_github_release(params[:is_prerelease], params[:github_token])
         Helper::GitHubActionsHelper.set_output("tag", tag_and_release_output[:tag])

diff --git a/spec/tag_release_action_spec.rb b/spec/tag_release_action_spec.rb
@@ -268,7 +268,7 @@
   describe "#merge_or_delete_branch" do
     subject { Fastlane::Actions::TagReleaseAction.merge_or_delete_branch(@params) }
 
-    let (:branch) { "release/1.1.0" }
+    let (:branch) { "release/ios/1.1.0" }
     let (:other_action) { double(git_branch: branch) }
 
     platform_contexts = [