fastlane-plugin-wpmreleasetoolkit 12.0.0 → 12.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f4bad14f2aca7e44fede245ed91674426c688395c9d6a5085a4d25a5e30e361
-  data.tar.gz: 66e0440a5340b12dff4a5e35c37759c48d04c8f157e83e4c57ca94cde2c4135e
+  metadata.gz: 5efb1f6f88d1bb1617313112768ef93497cabe3897bb4834c5026a4e9a68ced0
+  data.tar.gz: 8eaef85d47b2ec7be3e2da0693856923c02e6f67b65707e4143d7241147a7435
 SHA512:
-  metadata.gz: 1ed67cfa98a54dfe351d5e90ac318f97f1d40d777ac498f427b7c417f32651f16574eb441de44730ef5a7299edef57b096137b06ab64a4964aca56d072e7a0c0
-  data.tar.gz: a698dc1828a99415b4b88b373541ad20b264933cb2d13b0c65b2efd6c4608361b40bb0dca4756f9a518dee3a9e7fa4f8c43e142dfb3a50bba391398f76744bd5
+  metadata.gz: 7c05b2af7ca941a5afb52b703f3f0ee315e0ab48ffa87de88c48c5f22bbc1db82f0a819c7e4f2b10e754b6558569d801431e64b00f491e282eadd9885c4f75ac
+  data.tar.gz: fc832aaf5f31e2e6b3f51c268f38529f056dc40a0971fb67e962da313634e2c56580eeac23f8d2e94f2f3dcc74ad3d69b0a465724afb7c178501103a5c01d309

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

@@ -0,0 +1,63 @@
+module Fastlane
+  module Actions
+    class BuildkitePipelineUploadAction < Action
+      DEFAULT_ENV_FILE = File.join('.buildkite', 'shared-pipeline-vars').freeze
+
+      def self.run(params)
+        pipeline_file = params[:pipeline_file]
+        env_file = params[:env_file]
+        environment = params[:environment]
+
+        UI.user_error!("Pipeline file not found: #{pipeline_file}") unless File.exist?(pipeline_file)
+        UI.user_error!('This action can only be called from a Buildkite CI build') unless ENV['BUILDKITE'] == 'true'
+
+        UI.message "Adding steps from `#{pipeline_file}` to the current build"
+
+        if env_file && File.exist?(env_file)
+          UI.message(" - Sourcing environment file beforehand: #{env_file}")
+
+          sh(environment, "source #{env_file.shellescape} && buildkite-agent pipeline upload #{pipeline_file.shellescape}")
+        else
+          sh(environment, 'buildkite-agent', 'pipeline', 'upload', pipeline_file)
+        end
+      end
+
+      def self.description
+        # https://buildkite.com/docs/agent/v3/cli-pipeline#uploading-pipelines
+        'Uploads a pipeline to Buildkite, adding all its steps to the current build'
+      end
+
+      def self.available_options
+        [
+          FastlaneCore::ConfigItem.new(
+            key: :pipeline_file,
+            description: 'The path to the YAML pipeline file to upload',
+            optional: false,
+            type: String
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :env_file,
+            description: 'The path to a bash file to be sourced before uploading the pipeline',
+            optional: true,
+            default_value: DEFAULT_ENV_FILE,
+            type: String
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :environment,
+            description: 'Environment variables to load when running `pipeline upload`, to allow for variable substitution in the YAML pipeline',
+            type: Hash,
+            default_value: {}
+          ),
+        ]
+      end
+
+      def self.authors
+        ['Automattic']
+      end
+
+      def self.is_supported?(platform)
+        true
+      end
+    end
+  end
+end

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

@@ -58,7 +58,7 @@ module Fastlane
           ),
           FastlaneCore::ConfigItem.new(
             key: :buildkite_organization,
-            env_name: 'BUILDKITE_ORGANIZTION',
+            env_name: 'BUILDKITE_ORGANIZATION',
             description: 'The Buildkite organization that contains your pipeline',
             type: String
           ),

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

@@ -103,10 +103,7 @@ module Fastlane
         # if there's a callback, make sure it didn't switch branches
         other_action.ensure_git_branch(branch: "^#{intermediate_branch}/") unless intermediate_branch_created_callback.nil?
 
-        base_branch_ref = base_branch.start_with?('origin/') ? base_branch : "origin/#{base_branch}"
-        head_branch_ref = head_branch.start_with?('origin/') ? head_branch : "origin/#{head_branch}"
-
-        if Fastlane::Helper::GitHelper.point_to_same_commit?(base_branch_ref, head_branch_ref)
+        if Fastlane::Helper::GitHelper.point_to_same_commit?(base_branch, head_branch)
           UI.error("No differences between #{head_branch} and #{base_branch}. Skipping PR creation.")
           return nil
         end

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

@@ -2,15 +2,39 @@ module Fastlane
   module Actions
     class IosGenerateStringsFileFromCodeAction < Action
       def self.run(params)
-        files = files_matching(paths: params[:paths], exclude: params[:exclude])
-        flags = [('-q' if params[:quiet]), ('-SwiftUI' if params[:swiftui])].compact
-        flags += Array(params[:routines]).flat_map { |routine| ['-s', routine] }
-        cmd = ['genstrings', '-o', params[:output_dir], *flags, *files]
-        out = Actions.sh_control_output(*cmd, print_command: FastlaneCore::Globals.verbose?, print_command_output: true)
-        out = out.scrub.strip.split("\n")
-        errors = out.select { |line| line.include?('genstrings: error: ') }
-        UI.user_error!(errors.join("\n")) unless !params[:fail_on_error] || errors.empty?
-        out
+        output_encoding = begin
+          Encoding.find(params[:output_encoding])
+        rescue ArgumentError => e
+          UI.user_error!(e.message)
+        end
+
+        Dir.mktmpdir('genstrings-output-') do |tmpdir|
+          # Build the command arguments
+          files = files_matching(paths: params[:paths], exclude: params[:exclude])
+          flags = [
+            ('-q' if params[:quiet]),
+            ('-SwiftUI' if params[:swiftui]),
+            # If no endianness (-bigEndian vs -littleEndian) is specified, genstrings will use endianness of the current OS.
+            # Currently, genstrings runs only on macOS, which is little-endian, so this parameter is not strictly necessary.
+            # We make it explicit here to raise visibility on the relationship between the endianness of the genstring output and that of the encoding later on.
+            '-littleEndian',
+          ].compact
+          flags += Array(params[:routines]).flat_map { |routine| ['-s', routine] }
+          cmd = ['genstrings', '-o', tmpdir, *flags, *files]
+
+          # Run the genstrings command
+          cmd_output = Actions.sh_control_output(*cmd, print_command: FastlaneCore::Globals.verbose?, print_command_output: true)
+
+          # Extract errors from output, if any
+          cmd_output = cmd_output.scrub.strip.split("\n")
+          errors = cmd_output.select { |line| line.include?('genstrings: error: ') }
+          UI.user_error!(errors.join("\n")) unless !params[:fail_on_error] || errors.empty?
+
+          # Convert generated files to requested encoding if necessary, and copy to final destination
+          post_process_generated_files(source_dir: tmpdir, dest_dir: params[:output_dir], dest_encoding: output_encoding)
+
+          cmd_output
+        end
       end
 
       # Adds the proper `**/*.{m,swift}` to the list of paths
@@ -24,6 +48,7 @@ module Fastlane
         end
       end
 
+      # List files matching a list of glob patterns, except the ones matching the list of exclusion patterns
       def self.files_matching(paths:, exclude:)
         globbed_paths = paths.map { |p| glob_pattern(p) }
         Dir.glob(globbed_paths).reject do |file|
@@ -31,6 +56,24 @@ module Fastlane
         end
       end
 
+      # Convert the generated files in `source_dir` to the `dest_encoding` if necessary, then copy them to the final `dest_dir`
+      def self.post_process_generated_files(source_dir:, dest_dir:, dest_encoding:)
+        Dir.each_child(source_dir) do |filename|
+          source = File.join(source_dir, filename)
+          next if filename.start_with?('.') || !File.file?(source)
+
+          destination = File.join(dest_dir, filename)
+          if dest_encoding.name == 'UTF-16LE'
+            # genstrings generates UTF-16 LittleEndian by default, so if that's the requested output encoding, we just copy
+            # the file directly, to avoid the read/write dance, reduce memory footprint, and reduce risk of encoding errors on read
+            FileUtils.cp(source, destination)
+          else
+            content = File.read(source, binmode: true, encoding: 'BOM|UTF-16LE')
+            File.write(destination, content, binmode: true, encoding: dest_encoding.name)
+          end
+        end
+      end
+
       #####################################################
       # @!group Documentation
       #####################################################
@@ -85,6 +128,11 @@ module Fastlane
                                        env_name: 'FL_IOS_GENERATE_STRINGS_FILE_FROM_CODE_OUTPUT_DIR',
                                        description: 'The path to the directory where the generated `.strings` files should be created',
                                        type: String),
+          FastlaneCore::ConfigItem.new(key: :output_encoding,
+                                       env_name: 'FL_IOS_GENERATE_STRINGS_FILE_FROM_CODE_OUTPUT_ENCODING',
+                                       description: 'The encoding to convert the generated files to',
+                                       type: String,
+                                       default_value: 'UTF-16LE'), # The default encoding used by `genstrings` for generated files
           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',

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

@@ -174,20 +174,23 @@ module Fastlane
       #
       # @param ref1 [String] the first git reference to check.
       # @param ref2 [String] the second git reference to check.
+      # @param remote_name [String] the name of the remote repository to use (default is 'origin').
+      #                             If nil or empty, no remote prefix will be used.
       #
       # @return [Boolean] true if the two references point to the same commit, false otherwise.
       #
-      def self.point_to_same_commit?(ref1, ref2)
+      def self.point_to_same_commit?(ref1, ref2, remote_name: 'origin')
         git_repo = Git.open(Dir.pwd)
 
+        ref1_full = remote_name.to_s.empty? ? ref1 : "#{remote_name}/#{ref1}"
+        ref2_full = remote_name.to_s.empty? ? ref2 : "#{remote_name}/#{ref2}"
         begin
-          ref1_commit = git_repo.gcommit(ref1)
-          ref2_commit = git_repo.gcommit(ref2)
+          ref1_commit = git_repo.gcommit(ref1_full)
+          ref2_commit = git_repo.gcommit(ref2_full)
         rescue StandardError => e
-          puts "Error: #{e.message}"
+          UI.error "Error fetching commits for #{ref1_full} and #{ref2_full}: #{e.message}"
           return false
         end
-
         ref1_commit.sha == ref2_commit.sha
       end
 

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

@@ -2,6 +2,6 @@
 
 module Fastlane
   module Wpmreleasetoolkit
-    VERSION = '12.0.0'
+    VERSION = '12.2.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-wpmreleasetoolkit
 version: !ruby/object:Gem::Version
-  version: 12.0.0
+  version: 12.2.0
 platform: ruby
 authors:
 - Automattic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-03 00:00:00.000000000 Z
+date: 2024-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -406,6 +406,7 @@ files:
 - lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_update_release_notes.rb
 - lib/fastlane/plugin/wpmreleasetoolkit/actions/common/buildkite_annotate_action.rb
 - lib/fastlane/plugin/wpmreleasetoolkit/actions/common/buildkite_metadata_action.rb
+- lib/fastlane/plugin/wpmreleasetoolkit/actions/common/buildkite_pipeline_upload_action.rb
 - lib/fastlane/plugin/wpmreleasetoolkit/actions/common/buildkite_trigger_build_action.rb
 - lib/fastlane/plugin/wpmreleasetoolkit/actions/common/check_for_toolkit_updates_action.rb
 - lib/fastlane/plugin/wpmreleasetoolkit/actions/common/check_translation_progress.rb