fastlane-plugin-wpmreleasetoolkit 13.0.0 → 13.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18c81344c45a90d79220d70143cda3ff32ba7a3d1c38bba9cc314d65b4da298a
-  data.tar.gz: 465273421965607cba8aec468763025dc2f2f0bf611204bf0e432b84f8f29c7d
+  metadata.gz: 812b207092ef802b165390e74ba296566e70a3e406c7e1a50572a6bd7b6da761
+  data.tar.gz: 9266eec38e720af58e54413e649b2451e0f88100f4621bfab25daa05912663ee
 SHA512:
-  metadata.gz: 67a1362ed01a86a83c40e5dc0c1f83e488601c132d168f3779b3f2d681ce06278a2d4d2cebd2b92d24c5fc744ea1d0e9d93a547d484d13a9950449ad429dcbea
-  data.tar.gz: c653d40521801bb9722c8ae5a6418359a269c5107271f732b9657e883d0f669eacfe6e5d072106c0d5eb9015b091dc20a4ebcd58b2ba4aba7afa5f10611397e0
+  metadata.gz: 45a5b7aceb10ac90eaf7bf81e3c8cf07d1ed67691d558c610d8393db098e699f20f8ed63dcaf97f3af44f70433ee70f278ac0ee7185a1374642c4b4504ac51df
+  data.tar.gz: 8a8f7296d5458082034650d8675a17e4144f3d9c5cfc45e7482101c69ab1cdcadc645109b5151a65099167b0b910b5b4f092e92f717dcd210e37c9d5e7780e3a

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/common/create_release_backmerge_pull_request_action.rb

@@ -9,6 +9,7 @@ module Fastlane
       DEFAULT_BRANCH = 'trunk'
 
       def self.run(params)
+        api_url = params[:api_url]
         token = params[:github_token]
         repository = params[:repository]
         source_branch = params[:source_branch]
@@ -41,6 +42,7 @@ module Fastlane
           Fastlane::Helper::GitHelper.checkout_and_pull(source_branch)
 
           create_backmerge_pr(
+            api_url: api_url,
             token: token,
             repository: repository,
             title: "Merge #{source_branch} into #{target_branch}",
@@ -76,6 +78,7 @@ module Fastlane
 
       # Creates a backmerge pull request using the `create_pull_request` Fastlane Action.
       #
+      # @param api_url [String] the GitHub API URL to use for creating the pull request
       # @param token [String] the GitHub token for authentication.
       # @param repository [String] the repository where the pull request will be created.
       # @param title [String] the title of the pull request.
@@ -90,7 +93,7 @@ module Fastlane
       #
       # @return [String] The URL of the created Pull Request, or `nil` if no PR was created.
       #
-      def self.create_backmerge_pr(token:, repository:, title:, head_branch:, base_branch:, labels:, milestone:, reviewers:, team_reviewers:, intermediate_branch_created_callback:)
+      def self.create_backmerge_pr(api_url:, token:, repository:, title:, head_branch:, base_branch:, labels:, milestone:, reviewers:, team_reviewers:, intermediate_branch_created_callback:) # rubocop:disable Metrics/ParameterLists
         # Do an early pre-check to see if the PR would be valid, but only if no callback (as a callback might add new commits on intermediate branch)
         if intermediate_branch_created_callback.nil? && !can_merge?(head_branch, into: base_branch)
           UI.error("Nothing to merge from #{head_branch} into #{base_branch}. Skipping PR creation.")
@@ -108,7 +111,9 @@ module Fastlane
 
         # Call the callback if one was provided to allow the use to add commits on the intermediate branch (e.g. solve conflicts)
         unless intermediate_branch_created_callback.nil?
-          intermediate_branch_created_callback.call(base_branch, intermediate_branch)
+          Dir.chdir(FastlaneCore::FastlaneFolder.path) do
+            intermediate_branch_created_callback.call(base_branch, intermediate_branch)
+          end
           # Make sure the callback block didn't switch branches
           other_action.ensure_git_branch(branch: "^#{intermediate_branch}$")
 
@@ -120,7 +125,7 @@ module Fastlane
           end
         end
 
-        other_action.push_to_git_remote(tags: false)
+        other_action.push_to_git_remote(tags: false, remote_branch: intermediate_branch, set_upstream: true)
 
         pr_body = <<~BODY
           Merging `#{head_branch}` into `#{base_branch}`.
@@ -136,6 +141,7 @@ module Fastlane
         BODY
 
         other_action.create_pull_request(
+          api_url: api_url,
           api_token: token,
           repo: repository,
           title: title,
@@ -191,50 +197,63 @@ module Fastlane
       end
 
       def self.available_options
+        # Parameters we want to forward from Fastlane's create_pull_request action
+        forwarded_param_keys = %i[
+          api_url
+          labels
+          assignees
+          reviewers
+          team_reviewers
+        ].freeze
+
+        forwarded_params = Fastlane::Actions::CreatePullRequestAction.available_options.select do |opt|
+          forwarded_param_keys.include?(opt.key)
+        end
+
         [
-          FastlaneCore::ConfigItem.new(key: :repository,
-                                       env_name: 'GHHELPER_REPOSITORY',
-                                       description: 'The remote path of the GH repository on which we work',
-                                       optional: false,
-                                       type: String),
-          FastlaneCore::ConfigItem.new(key: :source_branch,
-                                       description: 'The source branch to create a backmerge PR from, in the format `release/x.y.z`',
-                                       optional: false,
-                                       type: String),
-          FastlaneCore::ConfigItem.new(key: :default_branch,
-                                       description: 'The default branch to target if no newer release branches exist',
-                                       optional: true,
-                                       default_value: DEFAULT_BRANCH,
-                                       type: String),
-          FastlaneCore::ConfigItem.new(key: :target_branches,
-                                       description: 'Array of target branches for the backmerge. If empty, the action will determine target branches by finding all `release/x.y.z` branches with a `x.y.z` version greater than the version in source branch\'s name. If none are found, it will target `default_branch`', # rubocop:disable Layout/LineLength
-                                       optional: true,
-                                       default_value: [],
-                                       type: Array),
-          FastlaneCore::ConfigItem.new(key: :labels,
-                                       description: 'The labels that should be assigned to the backmerge PRs',
-                                       optional: true,
-                                       default_value: [],
-                                       type: Array),
-          FastlaneCore::ConfigItem.new(key: :milestone_title,
-                                       description: 'The title of the milestone to assign to the created PRs',
-                                       optional: true,
-                                       type: String),
-          FastlaneCore::ConfigItem.new(key: :reviewers,
-                                       description: 'An array of GitHub users that will be assigned to the pull request',
-                                       optional: true,
-                                       type: Array),
-          FastlaneCore::ConfigItem.new(key: :team_reviewers,
-                                       description: 'An array of GitHub team slugs that will be assigned to the pull request',
-                                       optional: true,
-                                       type: Array),
-          FastlaneCore::ConfigItem.new(key: :intermediate_branch_created_callback,
-                                       description: 'Callback to allow for the caller to perform operations on the intermediate branch (e.g. pushing new commits to pre-solve conflicts) before creating the PR. ' \
-                                        + 'The callback receives two parameters: the base (target) branch for the PR and the intermediate branch name that has been created.' \
-                                        + 'Note that if you use the callback to add new commits to the intermediate branch, you are responsible for git-pushing them too',
-                                       optional: true,
-                                       type: Proc),
-          Fastlane::Helper::GithubHelper.github_token_config_item,
+          *forwarded_params,
+          Fastlane::Helper::GithubHelper.github_token_config_item, # we forward `github_token` to `api_token` in the `create_pull_request` action
+          FastlaneCore::ConfigItem.new(
+            key: :repository,
+            env_name: 'GHHELPER_REPOSITORY',
+            description: 'The remote path of the GH repository on which we work',
+            optional: false,
+            type: String
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :source_branch,
+            description: 'The source branch to create a backmerge PR from, in the format `release/x.y.z`',
+            optional: false,
+            type: String
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :default_branch,
+            description: 'The default branch to target if no newer release branches exist',
+            optional: true,
+            default_value: DEFAULT_BRANCH,
+            type: String
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :target_branches,
+            description: 'Array of target branches for the backmerge. If empty, the action will determine target branches by finding all `release/x.y.z` branches with a `x.y.z` version greater than the version in source branch\'s name. If none are found, it will target `default_branch`',
+            optional: true,
+            default_value: [],
+            type: Array
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :milestone_title,
+            description: 'The title of the milestone to assign to the created PRs',
+            optional: true,
+            type: String
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :intermediate_branch_created_callback,
+            description: 'Callback to allow for the caller to perform operations on the intermediate branch (e.g. pushing new commits to pre-solve conflicts) before creating the PR. ' \
+             + 'The callback receives two parameters: the base (target) branch for the PR and the intermediate branch name that has been created.' \
+             + 'Note that if you use the callback to add new commits to the intermediate branch, you are responsible for git-pushing them too',
+            optional: true,
+            type: Proc
+          ),
         ]
       end
 

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/common/prototype_build_details_comment_action.rb

@@ -102,12 +102,15 @@ module Fastlane
       # @return [Hash<String, String>] A hash of all the metadata, consolidated from both the explicit and the implicit ones
       #
       def self.generate_metadata_hash(params:, release_info:)
+        # Add explicit metadata provided by the caller
         metadata = params[:metadata]&.transform_keys(&:to_s) || {}
 
         # Add Firebase-specific metadata if available
-        metadata['Build Number'] ||= "<code>#{release_info&.build_version}</code>"
-        metadata['Version'] ||= "<code>#{release_info&.display_version}</code>"
-        metadata[release_info&.os == 'ios' ? 'Bundle ID' : 'Application ID'] ||= "<code>#{release_info&.bundle_id}</code>"
+        unless release_info.nil?
+          metadata['Build Number'] ||= "<code>#{release_info.build_version}</code>"
+          metadata['Version'] ||= "<code>#{release_info.display_version}</code>"
+          metadata[release_info.os == 'ios' ? 'Bundle ID' : 'Application ID'] ||= "<code>#{release_info.bundle_id}</code>"
+        end
 
         # Add git metadata
         metadata['Commit'] ||= ENV.fetch('BUILDKITE_COMMIT', nil) || other_action.last_git_commit[:abbreviated_commit_hash]

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

@@ -342,7 +342,10 @@ module Fastlane
         #
         def self.post_process_xml!(translated_xml, locale_code:, original_xml:)
           copy_orig_attributes = lambda do |node, xpath|
-            orig_attributes = original_xml.xpath(xpath)&.first&.attribute_nodes&.to_h do |attr|
+            found_node = original_xml.xpath(xpath)&.first
+            return unless found_node
+
+            orig_attributes = found_node.attribute_nodes&.to_h do |attr|
               [[attr.namespace&.prefix, attr.name].compact.join(':'), attr.value]
             end
             orig_attributes&.each { |k, v| node[k] = v unless k == 'name' }

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

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require 'fastlane'
+
+# This monkey-patch adds Buildkite-aware logs to fastlane so it generates a collapsible log group in Buildkite for each action execution.
+#
+# @env `FASTLANE_DISABLE_ACTIONS_BUILDKITE_LOG_GROUPS`
+#     Set this variable to '1' to disable the auto-application of the monkey patch.
+
+unless !ENV.key?('BUILDKITE') || FastlaneCore::Env.truthy?('FASTLANE_DISABLE_ACTIONS_BUILDKITE_LOG_GROUPS')
+  FastlaneCore::UI.verbose('Monkey-patching fastlane to add Buildkite-aware log groups for each action execution')
+
+  module Fastlane
+    module Actions
+      module SharedValues
+        # This differs from the existing `SharedValues::LANE_NAME`, which always contains the name of the **top-level** lane
+        CURRENTLY_RUNNING_LANE_NAME = :CURRENTLY_RUNNING_LANE_NAME
+      end
+
+      module BuildkiteLogActionsAsCollapsibleGroups
+        def execute_action(action_name, &)
+          unless %w[is_ci? is_ci].include?(action_name)
+            current_lane = lane_context[SharedValues::CURRENTLY_RUNNING_LANE_NAME]
+            lane_name_prefix = (current_lane || '').empty? ? '' : "[lane :#{current_lane}]"
+            puts "~~~ :fastlane: #{lane_name_prefix} #{action_name}"
+          end
+          super
+        end
+      end
+
+      class << self
+        prepend BuildkiteLogActionsAsCollapsibleGroups
+      end
+    end
+
+    class Runner
+      prepend(Module.new do
+        def current_lane=(lane_name)
+          super
+          Fastlane::Actions.lane_context[Fastlane::Actions::SharedValues::CURRENTLY_RUNNING_LANE_NAME] = lane_name
+        end
+      end)
+    end
+  end
+end

data/lib/fastlane/plugin/wpmreleasetoolkit/helper/ios/ios_adc_app_sizes_helper.rb

@@ -54,7 +54,7 @@ module Fastlane
           csv = "Version\t#{devices.join("\t")}\n"
           app_sizes.each do |details|
             build_number = details['cfBundleVersion']
-            sizes = details['sizesInBytes'].select { |name, _| devices.include?(name) }
+            sizes = details['sizesInBytes'].slice(*devices)
             csv += "#{build_number}\t" + devices.map { |d| sz(sizes[d]['compressed']) }.join("\t") + "\n"
           end
           csv
@@ -64,7 +64,7 @@ module Fastlane
           devices = DEFAULT_DEVICES if devices.nil? || devices.empty?
           app_sizes.map do |details|
             build_number = details['cfBundleVersion']
-            sizes = details['sizesInBytes'].select { |name, _| devices.include?(name) }
+            sizes = details['sizesInBytes'].slice(*devices)
             col_size = devices.map(&:length).max
             table = "| #{build_number.ljust(col_size)} | Download | Install  |\n"
             table += "|:#{'-' * col_size}-|---------:|---------:|\n"

data/lib/fastlane/plugin/wpmreleasetoolkit/helper/ios/ios_strings_file_validation_helper.rb

@@ -65,10 +65,10 @@ module Fastlane
         # Inspects the given `.strings` file for duplicated keys, returning them if any.
         #
         # @param [String] file The path to the file to inspect.
-        # @return [Hash<String, Array<Int>] Hash with the dublipcated keys.
+        # @return [Hash<String, Array<Int>] Hash with the duplicated keys.
         #         Each element has the duplicated key (from the `.strings`) as key and an array of line numbers where the key occurs as value.
         def self.find_duplicated_keys(file:)
-          keys_with_lines = Hash.new([])
+          keys_with_lines = Hash.new { |h, k| h[k] = [] }
 
           state = State.new(context: :root, buffer: StringIO.new, in_escaped_ctx: false, found_key: nil)
 

data/lib/fastlane/plugin/wpmreleasetoolkit/version.rb

@@ -2,6 +2,6 @@
 
 module Fastlane
   module Wpmreleasetoolkit
-    VERSION = '13.0.0'
+    VERSION = '13.1.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-wpmreleasetoolkit
 version: !ruby/object:Gem::Version
-  version: 13.0.0
+  version: 13.1.0
 platform: ruby
 authors:
 - Automattic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-11 00:00:00.000000000 Z
+date: 2025-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -457,6 +457,7 @@ files:
 - lib/fastlane/plugin/wpmreleasetoolkit/helper/android/android_tools_path_helper.rb
 - lib/fastlane/plugin/wpmreleasetoolkit/helper/android/android_version_helper.rb
 - lib/fastlane/plugin/wpmreleasetoolkit/helper/app_size_metrics_helper.rb
+- lib/fastlane/plugin/wpmreleasetoolkit/helper/buildkite_aware_log_groups.rb
 - lib/fastlane/plugin/wpmreleasetoolkit/helper/ci_helper.rb
 - lib/fastlane/plugin/wpmreleasetoolkit/helper/configure_helper.rb
 - lib/fastlane/plugin/wpmreleasetoolkit/helper/encryption_helper.rb