Merge pull request #288 from wordpress-mobile/fix/hotfix-actions

Fix hotfix actions

Author: AliSoftware

CHANGELOG.md

@@ -14,11 +14,12 @@ _None_
 
 ### Bug Fixes
 
-Fixes a bug that was breaking the `promo_screenshots` helper [#276]
+* Fixes a bug that was breaking the `promo_screenshots` helper [#276]
+* Fix crashes in actions dealing with hotfixes. [#288]
 
 ### Internal Changes
 
-Update the `BigDecimal` and `ActiveSupport` gems to clean up our `Gemfile` and improve future compatibility.
+* Update the `BigDecimal` and `ActiveSupport` gems to clean up our `Gemfile` and improve future compatibility.
 
 ## 1.3.1
 

lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_bump_version_hotfix.rb

@@ -10,17 +10,17 @@ def self.run(params)
         app = params[:app]
 
         current_version = Fastlane::Helper::Android::VersionHelper.get_release_version(product_name: app)
-        current_version_alpha = Fastlane::Helper::Android::VersionHelper.get_alpha_version(app)
-        new_version = Fastlane::Helper::Android::VersionHelper.calc_next_hotfix_version(params[:version_name], params[:version_code])
-        new_short_version = new_version_name
-        new_release_branch = "release/#{new_short_version}"
+        new_version = Fastlane::Helper::Android::VersionHelper.calc_next_hotfix_version(params[:version_name], params[:version_code]) # NOTE: this just puts the name/code values in a tuple, unchanged (no actual calc/bumping)
+        new_release_branch = "release/#{params[:version_name]}"
 
-        UI.message("Current version[#{app}]: #{current_version[Fastlane::Helper::Android::VersionHelper::VERSION_NAME]}(#{current_version[Fastlane::Helper::Android::VersionHelper::VERSION_CODE]})")
-        UI.message("New hotfix version[#{app}]: #{new_version[Fastlane::Helper::Android::VersionHelper::VERSION_NAME]}(#{new_version[Fastlane::Helper::Android::VersionHelper::VERSION_CODE]})")
+        name_key = Fastlane::Helper::Android::VersionHelper::VERSION_NAME
+        code_key = Fastlane::Helper::Android::VersionHelper::VERSION_CODE
+        UI.message("Current version [#{app}]: #{current_version[name_key]} (#{current_version[code_key]})")
+        UI.message("New hotfix version[#{app}]: #{new_version[name_key]} (#{new_version[code_key]})")
         UI.message("Release branch: #{new_release_branch}")
 
         UI.message 'Updating app version...'
-        Fastlane::Helper::Android::VersionHelper.update_versions(app, new_version, current_version_alpha)
+        Fastlane::Helper::Android::VersionHelper.update_versions(app, new_version, nil)
         UI.message 'Done!'
 
         Fastlane::Helper::Android::GitHelper.commit_version_bump()
@@ -41,25 +41,22 @@ def self.details
       end
 
       def self.available_options
-        # Define all options your action supports.
-
-        # Below a few examples
         [
           FastlaneCore::ConfigItem.new(key: :version_name,
                                        env_name: 'FL_ANDROID_BUMP_VERSION_HOTFIX_VERSION',
-                                       description: 'The version of the hotfix',
+                                       description: 'The version name for the hotfix',
                                        is_string: true),
           FastlaneCore::ConfigItem.new(key: :version_code,
                                        env_name: 'FL_ANDROID_BUMP_VERSION_HOTFIX_CODE',
-                                       description: 'The version of the hotfix'),
+                                       description: 'The version code for the hotfix'),
           FastlaneCore::ConfigItem.new(key: :previous_version_name,
                                        env_name: 'FL_ANDROID_BUMP_VERSION_HOTFIX_PREVIOUS_VERSION',
                                        description: 'The version to branch from',
-                                       is_string: true), # the default value if the user didn't provide one
+                                       is_string: true),
           FastlaneCore::ConfigItem.new(key: :app,
                                        env_name: 'PROJECT_NAME',
                                        description: 'The name of the app to get the release version for',
-                                       is_string: true), # true: verifies the input is a string, false: every kind of value
+                                       is_string: true),
         ]
       end
 

lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_hotifx_prechecks.rb

@@ -14,7 +14,7 @@ def self.run(params)
 
         # Confirm
         message = "Requested Hotfix version: #{new_ver}\n"
-        message << "Branching from: #{prev_ver}\n"
+        message << "Branching from tag: #{prev_ver}\n"
 
         if params[:skip_confirm]
           UI.message(message)
@@ -50,13 +50,13 @@ def self.available_options
         [
           FastlaneCore::ConfigItem.new(key: :version_name,
                                        env_name: 'FL_ANDROID_HOTFIX_PRECHECKS_VERSION',
-                                       description: 'The version to work on', # a short description of this parameter
+                                       description: 'The hotfix version number to create',
                                        is_string: true),
           FastlaneCore::ConfigItem.new(key: :skip_confirm,
                                        env_name: 'FL_ANDROID_HOTFIX_PRECHECKS_SKIPCONFIRM',
                                        description: 'Skips confirmation',
-                                       is_string: false, # true: verifies the input is a string, false: every kind of value
-                                       default_value: false), # the default value if the user didn't provide one
+                                       is_string: false, # Boolean
+                                       default_value: false),
         ]
       end