fastlane-plugin-wpmreleasetoolkit 7.0.0 → 8.0.0

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/add_devices_to_provisioning_profiles.rb

@@ -42,7 +42,7 @@ module Fastlane
           FastlaneCore::ConfigItem.new(
             key: :app_identifier,
             description: 'List of App Identifiers that should contain the new device identifier',
-            is_string: false,
+            type: Array,
             verify_block: proc do |value|
               UI.user_error!('You must provide an array of bundle identifiers in `app_identifier`') if value.empty?
             end
@@ -50,7 +50,7 @@ module Fastlane
           FastlaneCore::ConfigItem.new(
             key: :team_id,
             description: 'The team_id for the provisioning profiles',
-            is_string: true,
+            type: String,
             verify_block: proc do |value|
               UI.user_error!('You must provide a team ID in `team_id`') unless value && (!value.empty?)
             end

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_betabuild_prechecks.rb

@@ -63,12 +63,12 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :base_version,
                                        env_name: 'FL_IOS_BETABUILD_PRECHECKS_BASE_VERSION',
                                        description: 'The version to work on', # a short description of this parameter
-                                       is_string: true,
-                                       optional: true), # true: verifies the input is a string, false: every kind of value),
+                                       type: String,
+                                       optional: true),
           FastlaneCore::ConfigItem.new(key: :skip_confirm,
                                        env_name: 'FL_IOS_BETABUILD_PRECHECKS_SKIPCONFIRM',
                                        description: 'Skips confirmation',
-                                       is_string: false, # true: verifies the input is a string, false: every kind of value
+                                       type: Boolean,
                                        default_value: false), # the default value if the user didn't provide one
           FastlaneCore::ConfigItem.new(key: :default_branch,
                                        env_name: 'FL_RELEASE_TOOLKIT_DEFAULT_BRANCH',

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_build_prechecks.rb

@@ -36,22 +36,22 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :skip_confirm,
                                        env_name: 'FL_IOS_BUILD_PRECHECKS_SKIP_CONFIRM',
                                        description: 'True to avoid the system ask for confirmation',
-                                       is_string: false,
+                                       type: Boolean,
                                        default_value: false),
           FastlaneCore::ConfigItem.new(key: :internal,
                                        env_name: 'FL_IOS_BUILD_PRECHECKS_INTERNAL_BUILD',
                                        description: 'True if this is for an internal build',
-                                       is_string: false,
+                                       type: Boolean,
                                        default_value: false),
           FastlaneCore::ConfigItem.new(key: :external,
                                        env_name: 'FL_IOS_BUILD_PRECHECKS_EXTERNAL_BUILD',
                                        description: 'True if this is for a public build',
-                                       is_string: false,
+                                       type: Boolean,
                                        default_value: false),
           FastlaneCore::ConfigItem.new(key: :internal_on_single_version,
                                        env_name: 'FL_IOS_BUILD_PRECHECKS_INTERNAL_SV_BUILD',
                                        description: 'True if this is for an internal build that follows the same versioning of the external',
-                                       is_string: false,
+                                       type: Boolean,
                                        default_value: false),
         ]
       end

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_build_preflight.rb

@@ -53,7 +53,7 @@ module Fastlane
           FastlaneCore::ConfigItem.new(
             key: :derived_data_path,
             description: "The path to the DerivedData directory for the project. Should match what's used in the `gym` action",
-            is_string: true,
+            type: String,
             default_value: '~/Library/Developer/Xcode/DerivedData'
           ),
         ]

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_bump_version_hotfix.rb

@@ -43,19 +43,19 @@ module Fastlane
             key: :version,
             env_name: 'FL_IOS_BUMP_VERSION_HOTFIX_VERSION',
             description: 'The version of the hotfix',
-            is_string: true
+            type: String
           ),
           FastlaneCore::ConfigItem.new(
             key: :previous_version,
             env_name: 'FL_IOS_BUMP_VERSION_HOTFIX_PREVIOUS_VERSION',
             description: 'The version to branch from',
-            is_string: true
+            type: String
           ),
           FastlaneCore::ConfigItem.new(
             key: :skip_deliver,
             env_name: 'FL_IOS_BUMP_VERSION_HOTFIX_SKIP_DELIVER',
             description: 'Skips Deliverfile key update',
-            is_string: false, # Boolean parameter
+            type: Boolean,
             optional: true,
             # Don't skip the Deliverfile by default. At the time of writing, 2 out of 3 consumers
             # still have a Deliverfile.

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_check_beta_deps.rb

@@ -39,7 +39,7 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :podfile,
                                        env_name: 'FL_IOS_CHECKBETADEPS_PODFILE',
                                        description: 'Path to the Podfile to analyse',
-                                       is_string: true),
+                                       type: String),
         ]
       end
 

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_clear_intermediate_tags.rb

@@ -2,6 +2,8 @@ module Fastlane
   module Actions
     class IosClearIntermediateTagsAction < Action
       def self.run(params)
+        return unless UI.confirm("#{deprecated_notes} Would you like to continue with the action?")
+
         UI.message("Deleting tags for version: #{params[:version]}")
 
         require_relative '../../helper/git_helper'
@@ -26,11 +28,11 @@ module Fastlane
       #####################################################
 
       def self.description
-        'Cleans all the intermediate tags for the given version'
+        '(DEPRECATED) Cleans all the intermediate tags for the given version'
       end
 
       def self.details
-        'Cleans all the intermediate tags for the given version'
+        '(DEPRECATED) Cleans all the intermediate tags for the given version'
       end
 
       def self.available_options
@@ -38,7 +40,7 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :version,
                                        env_name: 'FL_IOS_CLEAN_INTERMEDIATE_TAGS_VERSION',
                                        description: 'The version of the tags to clear',
-                                       is_string: true),
+                                       type: String),
         ]
       end
 
@@ -48,6 +50,16 @@ module Fastlane
       def self.return_value
       end
 
+      def self.category
+        :deprecated
+      end
+
+      def self.deprecated_notes
+        "This action is deprecated as we don't believe it's currently in use in our projects.
+        However, just to be sure that it's not in use, we decided to deprecate it first. If you
+        believe that this is a mistake, please let us know on Slack."
+      end
+
       def self.authors
         ['Automattic']
       end

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_codefreeze_prechecks.rb

@@ -47,7 +47,7 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :skip_confirm,
                                        env_name: 'FL_IOS_CODEFREEZE_PRECHECKS_SKIPCONFIRM',
                                        description: 'Skips confirmation before codefreeze',
-                                       is_string: false, # true: verifies the input is a string, false: every kind of value
+                                       type: Boolean,
                                        default_value: false), # the default value if the user didn't provide one
           FastlaneCore::ConfigItem.new(key: :default_branch,
                                        env_name: 'FL_RELEASE_TOOLKIT_DEFAULT_BRANCH',

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_completecodefreeze_prechecks.rb

@@ -6,8 +6,10 @@ module Fastlane
 
         require_relative '../../helper/ios/ios_version_helper'
         require_relative '../../helper/ios/ios_git_helper'
+        require_relative '../../helper/git_helper'
 
-        UI.user_error!('This is not a release branch. Abort.') unless other_action.git_branch.start_with?('release/')
+        current_branch = Fastlane::Helper::GitHelper.current_git_branch
+        UI.user_error!("Current branch - '#{current_branch}' - is not a release branch. Abort.") unless current_branch.start_with?('release/')
 
         version = Fastlane::Helper::Ios::VersionHelper.get_public_version
         message = "Completing code freeze for: #{version}\n"
@@ -40,7 +42,7 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :skip_confirm,
                                        env_name: 'FL_IOS_COMPLETECODEFREEZE_PRECHECKS_SKIPCONFIRM',
                                        description: 'Skips confirmation',
-                                       is_string: false, # true: verifies the input is a string, false: every kind of value
+                                       type: Boolean,
                                        default_value: false), # the default value if the user didn't provide one
         ]
       end

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_download_strings_files_from_glotpress.rb

@@ -13,7 +13,7 @@ module Fastlane
           UI.message "Downloading translations for '#{lproj_name}' from GlotPress (#{glotpress_locale}) [#{params[:filters]}]..."
           lproj_dir = File.join(download_dir, "#{lproj_name}.lproj")
           destination = File.join(lproj_dir, "#{params[:table_basename]}.strings")
-          FileUtils.mkdir(lproj_dir) unless Dir.exist?(lproj_dir)
+          FileUtils.mkdir_p(lproj_dir)
 
           Fastlane::Helper::Ios::L10nHelper.download_glotpress_export_file(
             project_url: params[:project_url],

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_extract_keys_from_strings_files.rb

@@ -45,10 +45,10 @@ module Fastlane
       # @return [Hash<String, Array<String>>] The hash listing the keys to extract for each target file
       #
       def self.keys_list_per_target_file(original_files)
-        original_files.map do |original_file|
+        original_files.to_h do |original_file|
           keys = Fastlane::Helper::Ios::L10nHelper.read_strings_file_as_hash(path: original_file).keys
           [original_file, keys]
-        end.to_h
+        end
       rescue StandardError => e
         UI.user_error!("Failed to read the keys to extract from originals file: #{e.message}")
       end

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_final_tag.rb

@@ -2,6 +2,8 @@ module Fastlane
   module Actions
     class IosFinalTagAction < Action
       def self.run(params)
+        return unless UI.confirm("#{deprecated_notes} Would you like to continue with the action?")
+
         require_relative '../../helper/ios/ios_git_helper'
         require_relative '../../helper/ios/ios_version_helper'
         version = Fastlane::Helper::Ios::VersionHelper.get_public_version
@@ -18,11 +20,11 @@ module Fastlane
       #####################################################
 
       def self.description
-        'Finalize a relasae'
+        '(DEPRECATED) Finalize a relasae'
       end
 
       def self.details
-        'Removes the temp tags and pushes the final one'
+        '(DEPRECATED) Removes the temp tags and pushes the final one'
       end
 
       def self.available_options
@@ -30,7 +32,7 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :version,
                                        env_name: 'FL_IOS_FINAL_TAG_VERSION',
                                        description: 'The version of the release to finalize',
-                                       is_string: true),
+                                       type: String),
         ]
       end
 
@@ -40,6 +42,16 @@ module Fastlane
       def self.return_value
       end
 
+      def self.category
+        :deprecated
+      end
+
+      def self.deprecated_notes
+        "This action is deprecated as we don't believe it's currently in use in our projects.
+        However, just to be sure that it's not in use, we decided to deprecate it first. If you
+        believe that this is a mistake, please let us know on Slack."
+      end
+
       def self.authors
         ['Automattic']
       end

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_finalize_prechecks.rb

@@ -6,8 +6,10 @@ module Fastlane
 
         require_relative '../../helper/ios/ios_version_helper'
         require_relative '../../helper/ios/ios_git_helper'
+        require_relative '../../helper/git_helper'
 
-        UI.user_error!('This is not a release branch. Abort.') unless other_action.git_branch.start_with?('release/')
+        current_branch = Fastlane::Helper::GitHelper.current_git_branch
+        UI.user_error!("Current branch - '#{current_branch}' - is not a release branch. Abort.") unless current_branch.start_with?('release/')
 
         version = Fastlane::Helper::Ios::VersionHelper.get_public_version
         message = "Finalizing release: #{version}\n"
@@ -40,7 +42,7 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :skip_confirm,
                                        env_name: 'FL_IOS_FINALIZE_PRECHECKS_SKIPCONFIRM',
                                        description: 'Skips confirmation',
-                                       is_string: false, # true: verifies the input is a string, false: every kind of value
+                                       type: Boolean,
                                        default_value: false), # the default value if the user didn't provide one
         ]
       end

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_generate_strings_file_from_code.rb

@@ -74,12 +74,12 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :quiet,
                                        env_name: 'FL_IOS_GENERATE_STRINGS_FILE_FROM_CODE_QUIET',
                                        description: 'In quiet mode, `genstrings` will log warnings about duplicate values, but not about duplicate comments',
-                                       is_string: false, # Boolean
+                                       type: Boolean,
                                        default_value: true),
           FastlaneCore::ConfigItem.new(key: :swiftui,
                                        env_name: 'FL_IOS_GENERATE_STRINGS_FILE_FROM_CODE_SWIFTUI',
                                        description: "Should we include SwiftUI's `Text()` when parsing code with `genstrings`",
-                                       is_string: false, # Boolean
+                                       type: Boolean,
                                        default_value: false),
           FastlaneCore::ConfigItem.new(key: :output_dir,
                                        env_name: 'FL_IOS_GENERATE_STRINGS_FILE_FROM_CODE_OUTPUT_DIR',
@@ -88,7 +88,7 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :fail_on_error,
                                        env_name: 'FL_IOS_GENERATE_STRINGS_FILE_FROM_CODE_FAIL_ON_ERROR',
                                        description: 'If true, will fail with user_error! if `genstrings` printed any error while parsing',
-                                       is_string: false, # Boolean
+                                       type: Boolean,
                                        default_value: true),
         ]
       end

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_get_build_number.rb

@@ -0,0 +1,54 @@
+module Fastlane
+  module Actions
+    class IosGetBuildNumberAction < Action
+      def self.run(params)
+        require_relative '../../helper/ios/ios_version_helper'
+
+        xcconfig_file_path = params[:xcconfig_file_path]
+        Fastlane::Helper::Ios::VersionHelper.read_build_number_from_config_file(xcconfig_file_path)
+      end
+
+      #####################################################
+      # @!group Documentation
+      #####################################################
+
+      def self.description
+        'Gets the build number of the app'
+      end
+
+      def self.details
+        'Gets the build number of the app'
+      end
+
+      def self.available_options
+        [
+          FastlaneCore::ConfigItem.new(
+            key: :xcconfig_file_path,
+            env_name: 'FL_IOS_XCCONFIG_FILE_PATH',
+            description: 'Path to the .xcconfig file containing the build number',
+            type: String,
+            optional: false
+          ),
+        ]
+      end
+
+      def self.output
+        # Define the shared values you are going to provide
+      end
+
+      def self.return_value
+        # If you method provides a return value, you can describe here what it does
+        'Return the build number of the app'
+      end
+
+      def self.authors
+        # So no one will ever forget your contribution to fastlane :) You are awesome btw!
+        ['Automattic']
+      end
+
+      def self.is_supported?(platform)
+        [:ios, :mac].include?(platform)
+      end
+    end
+  end
+end

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_get_build_version.rb

@@ -32,7 +32,7 @@ module Fastlane
             key: :internal,
             env_name: 'FL_IOS_BUILD_VERSION_INTERNAL',
             description: 'If true, returns the internal build version, otherwise returns the public one',
-            is_string: false, # Boolean
+            type: Boolean,
             default_value: false
           ),
         ]

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_hotfix_prechecks.rb

@@ -51,11 +51,11 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :version,
                                        env_name: 'FL_IOS_HOTFIX_PRECHECKS_VERSION',
                                        description: 'The version to work on', # a short description of this parameter
-                                       is_string: true),
+                                       type: String),
           FastlaneCore::ConfigItem.new(key: :skip_confirm,
                                        env_name: 'FL_IOS_HOTFIX_PRECHECKS_SKIPCONFIRM',
                                        description: 'Skips confirmation',
-                                       is_string: false, # true: verifies the input is a string, false: every kind of value
+                                       type: Boolean,
                                        default_value: false), # the default value if the user didn't provide one
         ]
       end

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_lint_localizations.rb

@@ -163,7 +163,7 @@ module Fastlane
             description: 'Should we abort the rest of the lane with a global error if any violations are found?',
             optional: true,
             default_value: true,
-            is_string: false # https://docs.fastlane.tools/advanced/actions/#boolean-parameters
+            type: Boolean
           ),
           FastlaneCore::ConfigItem.new(
             key: :allow_retry,
@@ -171,7 +171,7 @@ module Fastlane
             description: 'If any violations are found, show an interactive prompt allowing the user to manually fix the issues locally and retry the linting',
             optional: true,
             default_value: false,
-            is_string: false # https://docs.fastlane.tools/advanced/actions/#boolean-parameters
+            type: Boolean
           ),
           FastlaneCore::ConfigItem.new(
             key: :check_duplicate_keys,
@@ -179,7 +179,7 @@ module Fastlane
             description: 'Checks the input files for duplicate keys',
             optional: true,
             default_value: true,
-            is_string: false # https://docs.fastlane.tools/advanced/actions/#boolean-parameters
+            type: Boolean
           ),
         ]
       end

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_update_metadata_source.rb

@@ -18,7 +18,6 @@ module Fastlane
         repo_clean = repo_status.empty?
         unless repo_clean
           Action.sh('git commit -m "Update metadata strings"')
-          Action.sh('git push')
         end
       end
 
@@ -42,7 +41,7 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :po_file_path,
                                        env_name: 'FL_IOS_UPDATE_METADATA_SOURCE_PO_FILE_PATH',
                                        description: 'The path of the .po file to update',
-                                       is_string: true,
+                                       type: String,
                                        verify_block: proc do |value|
                                                        UI.user_error!("No .po file path for UpdateMetadataSourceAction given, pass using `po_file_path: 'file path'`") unless value && (!value.empty?)
                                                        UI.user_error!("Couldn't find file at path '#{value}'") unless File.exist?(value)
@@ -56,7 +55,7 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :source_files,
                                        env_name: 'FL_IOS_UPDATE_METADATA_SOURCE_SOURCE_FILES',
                                        description: 'The hash with the path to the source files and the key to use to include their content',
-                                       is_string: false,
+                                       type: Hash,
                                        verify_block: proc do |value|
                                                        UI.user_error!("No source file hash for UpdateMetadataSourceAction given, pass using `source_files: 'source file hash'`") unless value && (!value.empty?)
                                                      end),

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_update_release_notes.rb

@@ -12,7 +12,7 @@ module Fastlane
         next_version = Fastlane::Helper::Ios::VersionHelper.calc_next_release_version(params[:new_version])
 
         Fastlane::Helper::ReleaseNotesHelper.add_new_section(path: path, section_title: next_version)
-        Fastlane::Helper::GitHelper.commit(message: "Release Notes: add new section for next version (#{next_version})", files: path, push: true)
+        Fastlane::Helper::GitHelper.commit(message: "Release Notes: add new section for next version (#{next_version})", files: path)
 
         UI.message 'Done.'
       end
@@ -34,11 +34,11 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :new_version,
                                        env_name: 'FL_IOS_UPDATE_RELEASE_NOTES_VERSION',
                                        description: 'The version we are currently freezing; An empty entry for the _next_ version after this one will be added to the release notes',
-                                       is_string: true),
+                                       type: String),
           FastlaneCore::ConfigItem.new(key: :release_notes_file_path,
                                        env_name: 'FL_IOS_UPDATE_RELEASE_NOTES_FILE_PATH',
                                        description: 'The path to the release notes file to be updated',
-                                       is_string: true,
+                                       type: String,
                                        default_value: File.join(ENV['PROJECT_ROOT_FOLDER'] || '.', 'RELEASE-NOTES.txt')),
         ]
       end

data/lib/fastlane/plugin/wpmreleasetoolkit/helper/an_metadata_update_helper.rb

@@ -50,7 +50,7 @@ module Fastlane
 
         if line_count <= 1
           # Single line output
-          fw.puts("msgid \"#{File.open(@content_file_path, 'r').read.rstrip}\"")
+          fw.puts("msgid \"#{File.read(@content_file_path).rstrip}\"")
         else
           # Multiple line output
           fw.puts('msgid ""')
@@ -145,7 +145,7 @@ module Fastlane
       end
 
       def generate_block(fw)
-        super(fw) unless File.zero?(@content_file_path)
+        super(fw) unless File.empty?(@content_file_path)
       end
     end
   end

data/lib/fastlane/plugin/wpmreleasetoolkit/helper/android/android_git_helper.rb

@@ -4,9 +4,10 @@ module Fastlane
       # Helper methods to execute git-related operations that are specific to Android projects
       #
       module GitHelper
-        # Commit and push the files that are modified when we bump version numbers on an iOS project
+        # Commit the files that are modified when we bump version numbers on an Android project
         #
-        # This typically commits and pushes the `build.gradle` file inside the project subfolder.
+        # This typically commits the `version.properties` inside root folder or `build.gradle` file
+        # inside the project subfolder.
         #
         # @env PROJECT_ROOT_FOLDER The path to the git root of the project
         # @env PROJECT_NAME The name of the directory containing the project code (especially containing the `build.gradle` file)
@@ -16,14 +17,12 @@ module Fastlane
           if File.exist?(Fastlane::Helper::Android::VersionHelper.version_properties_file)
             Fastlane::Helper::GitHelper.commit(
               message: 'Bump version number',
-              files: File.join(ENV['PROJECT_ROOT_FOLDER'], 'version.properties'),
-              push: true
+              files: File.join(ENV['PROJECT_ROOT_FOLDER'], 'version.properties')
             )
           else
             Fastlane::Helper::GitHelper.commit(
               message: 'Bump version number',
-              files: File.join(ENV['PROJECT_ROOT_FOLDER'], ENV['PROJECT_NAME'], 'build.gradle'),
-              push: true
+              files: File.join(ENV['PROJECT_ROOT_FOLDER'], ENV['PROJECT_NAME'], 'build.gradle')
             )
           end
         end

data/lib/fastlane/plugin/wpmreleasetoolkit/helper/android/android_localize_helper.rb

@@ -240,7 +240,7 @@ module Fastlane
           attributes_to_copy = %w[formatted] # Attributes that we want to replicate into translated `string.xml` files
           orig_file = File.join(res_dir, 'values', 'strings.xml')
           orig_xml = File.open(orig_file) { |f| Nokogiri::XML(f, nil, Encoding::UTF_8.to_s) }
-          orig_attributes = orig_xml.xpath('//string').map { |tag| [tag['name'], tag.attributes.select { |k, _| attributes_to_copy.include?(k) }] }.to_h
+          orig_attributes = orig_xml.xpath('//string').to_h { |tag| [tag['name'], tag.attributes.select { |k, _| attributes_to_copy.include?(k) }] }
 
           locales_map.each do |lang_codes|
             all_xml_documents = glotpress_filters.map do |filters|
@@ -262,7 +262,7 @@ module Fastlane
 
             # Save
             lang_dir = File.join(res_dir, "values-#{lang_codes[:android]}")
-            FileUtils.mkdir(lang_dir) unless Dir.exist?(lang_dir)
+            FileUtils.mkdir_p(lang_dir)
             lang_file = File.join(lang_dir, 'strings.xml')
             File.open(lang_file, 'w') { |f| merged_xml.write_to(f, encoding: Encoding::UTF_8.to_s, indent: 4) }
           end

data/lib/fastlane/plugin/wpmreleasetoolkit/helper/android/android_version_helper.rb

@@ -465,8 +465,8 @@ module Fastlane
         # @return [String] The path of the `build.gradle` file inside the project subfolder in the project's repo
         #
         def self.gradle_path
-          UI.user_error!("You need to set the \`PROJECT_ROOT_FOLDER\` environment variable to the path to the project's root") if ENV['PROJECT_ROOT_FOLDER'].nil?
-          UI.user_error!("You need to set the \`PROJECT_NAME\` environment variable to the relative path to the project subfolder name") if ENV['PROJECT_NAME'].nil?
+          UI.user_error!("You need to set the `PROJECT_ROOT_FOLDER` environment variable to the path to the project's root") if ENV['PROJECT_ROOT_FOLDER'].nil?
+          UI.user_error!('You need to set the `PROJECT_NAME` environment variable to the relative path to the project subfolder name') if ENV['PROJECT_NAME'].nil?
           File.join(ENV['PROJECT_ROOT_FOLDER'], ENV['PROJECT_NAME'], 'build.gradle')
         end
 

data/lib/fastlane/plugin/wpmreleasetoolkit/helper/git_helper.rb

@@ -73,16 +73,15 @@ module Fastlane
         Action.sh('git', 'submodule', 'update', '--init', '--recursive')
       end
 
-      # Create a new branch named `branch_name`, cutting it from branch/commit/tag `from`, and push it
+      # Create a new branch named `branch_name`, cutting it from branch/commit/tag `from`
       #
       # If the branch with that name already exists, it will instead switch to it and pull new commits.
       #
       # @param [String] branch_name The full name of the new branch to create, e.g "release/1.2"
       # @param [String?] from The branch or tag from which to cut the branch from.
       #        If `nil`, will cut the new branch from the current commit. Otherwise, will checkout that commit/branch/tag before cutting the branch.
-      # @param [Bool] push If true, will also push the branch to `origin`, tracking the upstream branch with the local one.
       #
-      def self.create_branch(branch_name, from: nil, push: true)
+      def self.create_branch(branch_name, from: nil)
         if branch_exists?(branch_name)
           UI.message("Branch #{branch_name} already exists. Skipping creation.")
           Action.sh('git', 'checkout', branch_name)
@@ -90,22 +89,19 @@ module Fastlane
         else
           Action.sh('git', 'checkout', from) unless from.nil?
           Action.sh('git', 'checkout', '-b', branch_name)
-          Action.sh('git', 'push', '-u', 'origin', branch_name) if push
         end
       end
 
       # `git add` the specified files (if any provided) then commit them using the provided message.
-      # Optionally, push the commit to the remote too.
       #
       # @param [String] message The commit message to use
       # @param [String|Array<String>] files A file or array of files to git-add before creating the commit.
       #        Use `nil` or `[]` if you already added the files in a separate step and don't wan't this method to add any new file before commit.
       #        Also accepts the special symbol `:all` to add all the files (`git commit -a -m …`).
-      # @param [Bool] push If true, will `git push` to `origin` after the commit has been created. Defaults to `false`.
       #
-      # @return [Bool] True if commit and push were successful, false if there was an issue during commit & push (most likely being "nothing to commit").
+      # @return [Bool] True if commit was successful, false if there was an issue (most likely being "nothing to commit").
       #
-      def self.commit(message:, files: nil, push: false)
+      def self.commit(message:, files: nil)
         files = [files] if files.is_a?(String)
         args = []
         if files == :all
@@ -115,7 +111,6 @@ module Fastlane
         end
         begin
           Action.sh('git', 'commit', *args, '-m', message)
-          Action.sh('git', 'push', 'origin', 'HEAD') if push
           return true
         rescue
           return false
@@ -181,6 +176,23 @@ module Fastlane
         Action.sh('git', 'fetch', '--tags')
       end
 
+      # Returns the current git branch, or "HEAD" if it's not checked out to any branch
+      # Can NOT be replaced using the environment variables such as `GIT_BRANCH` or `BUILDKITE_BRANCH`
+      #
+      # `fastlane` already has a helper action for this called `git_branch`, however it's modified
+      # by CI environment variables. We need to check which branch we are actually on and not the
+      # initial branch a CI build is started from, so we are using the `git_branch_name_using_HEAD`
+      # helper instead.
+      #
+      # See https://docs.fastlane.tools/actions/git_branch/#git_branch
+      #
+      # @return [String] The current git branch, or "HEAD" if it's not checked out to any branch
+      #
+      def self.current_git_branch
+        # We can't use `other_action.git_branch`, because it is modified by environment variables in Buildkite.
+        Fastlane::Actions.git_branch_name_using_HEAD
+      end
+
       # Checks if a branch exists locally.
       #
       # @param [String] branch_name The name of the branch to check for

data/lib/fastlane/plugin/wpmreleasetoolkit/helper/glotpress_helper.rb

@@ -66,7 +66,7 @@ module Fastlane
       # @return [Integer] The percentage of the translated strings.
       #
       def self.extract_value_from_translation_info_data(data:, language_code:, status:)
-        regex = "\/#{language_code}\/.*#{status}.*>([0-9,]+)"
+        regex = "/#{language_code}/.*#{status}.*>([0-9,]+)"
 
         # 1. Grep the line with contains the required info.
         # 2. Match the info and extract the value in group 1.