From 7f21c65de02da61eec06fd1bec0fd55b3108215c Mon Sep 17 00:00:00 2001 From: Kieran Date: Thu, 21 Nov 2024 15:32:07 +1100 Subject: [PATCH] testing --- .../actions/start_new_release_action.rb | 7 ++++--- .../helper/ddg_apple_automation_helper.rb | 2 +- spec/ddg_apple_automation_helper_spec.rb | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) 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 index b4803aa..167f239 100644 --- 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 @@ -29,10 +29,10 @@ def self.run(params) options[:version] = new_version options[:release_branch_name] = release_branch_name - # release_task_id = Helper::AsanaHelper.create_release_task(options[:platform], options[:version], options[:asana_user_id], options[:asana_access_token], options[:is_hotfix]) - # options[:release_task_id] = release_task_id + release_task_id = Helper::AsanaHelper.create_release_task(options[:platform], options[:version], options[:asana_user_id], options[:asana_access_token], options[:is_hotfix]) + options[:release_task_id] = release_task_id - # Helper::AsanaHelper.update_asana_tasks_for_internal_release(options) + Helper::AsanaHelper.update_asana_tasks_for_internal_release(options) unless params[:is_hotfix] end def self.description @@ -56,6 +56,7 @@ def self.details * pushes the changes to the remote repository, * creates a new Asana release task based off the provided task template, * updates the Asana release task with tasks included in the release. +* if it's a hotfix release, it will create a hotfix branch, update the build number and push changes DETAILS end 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 index e79de38..eb6ce63 100644 --- 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 @@ -232,7 +232,7 @@ def self.update_embedded_files(platform, other_action) def self.increment_build_number(platform, options, other_action) current_version = Helper::DdgAppleAutomationHelper.current_version current_build_number = Helper::DdgAppleAutomationHelper.current_build_number - build_number = "401" # Helper::DdgAppleAutomationHelper.calculate_next_build_number(platform, options, other_action) + build_number = Helper::DdgAppleAutomationHelper.calculate_next_build_number(platform, options, other_action) UI.important("Current version in project settings is #{current_version} (#{current_build_number}).") UI.important("Will be updated to #{current_version} (#{build_number}).") diff --git a/spec/ddg_apple_automation_helper_spec.rb b/spec/ddg_apple_automation_helper_spec.rb index 729a4d6..46e6ae2 100644 --- a/spec/ddg_apple_automation_helper_spec.rb +++ b/spec/ddg_apple_automation_helper_spec.rb @@ -151,6 +151,7 @@ def load_file(file) expect do Fastlane::Helper::DdgAppleAutomationHelper.create_hotfix_branch(source_version, new_version) end.to raise_error(FastlaneCore::Interface::FastlaneCommonException, "Branch hotfix/1.0.1 already exists in this repository. Aborting.") + end end describe ".validate_hotfix_version" do