Merge branch 'update/octokit' into update/buildkite-test-collector

Author: spencertransier

.rubocop.yml

@@ -49,6 +49,13 @@ Style/AsciiComments:
 Style/StringConcatenation:
   Enabled: false
 
+# This rule was enforced after upgrading Rubocop from `1.22.1` to `1.50.2`. We are disabling this rule for the
+# time being so that we don't see any unexpected behavior when running Release Toolkit actions that could be
+# changed by this rule. See https://github.com/wordpress-mobile/release-toolkit/pull/464#pullrequestreview-1396569629
+# for more discussion
+Style/FetchEnvVar:
+  Enabled: false
+  
 ########## Gemspec Rules
 
 # This was turned on by default after updating Rubocop to `1.50.2`. We want to disable this for now because

CHANGELOG.md

@@ -6,7 +6,7 @@
 
 ### Breaking Changes
 
-- Update `octokit` to `5.6.1` This is a major version bump from version `4.18`. The [breaking change in version `5.0.0`](https://github.com/octokit/octokit.rb/releases/tag/v5.0.0) is dropping Ruby 2.6 and lower. [#464]
+_None_
 
 ### New Features
 
@@ -21,6 +21,7 @@ _None_
 - Add "Mobile Secrets" to `configure_update` current branch message to clarify which repo it's referring to. [#455]
 - `buildkite_trigger_build` now prints the web URL of the newly scheduled build, to allow you to easily open it via cmd-click. [#460]
 - Add the branch information to the 'This is not a release branch' error that's thrown from complete code freeze lane. [#461]
+- Update `octokit` to `5.6.1` This is a major version bump from version `4.18`, but is not a breaking change for the Release Toolkit because it doesn't change any public APIs for clients. [#464]
 - Update `danger` to `9.3.0`. This is an internal-only change and is not a breaking change for clients. [#464]
 - Replace `rspec-buildkite-analytics` with `buildkite-test_collector` (Buildkite renamed the gem) and update it to `2.2.0`. This is another internal-only change and is not a breaking change for clients. [#465]
 

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

@@ -48,7 +48,7 @@ def self.available_options
             env_name: 'FL_DOWNLOAD_TRANSLATIONS_RES_DIR',
             description: "The path to the Android project's `res` dir (typically the `<project name>/src/main/res` directory) containing the `values-*` subdirs",
             type: String,
-            default_value: "#{ENV.fetch('PROJECT_NAME', nil)}/src/main/res"
+            default_value: "#{ENV['PROJECT_NAME']}/src/main/res"
           ),
           FastlaneCore::ConfigItem.new(
             key: :glotpress_url,

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

@@ -16,13 +16,13 @@ def self.commit_version_bump
           if File.exist?(Fastlane::Helper::Android::VersionHelper.version_properties_file)
             Fastlane::Helper::GitHelper.commit(
               message: 'Bump version number',
-              files: File.join(ENV.fetch('PROJECT_ROOT_FOLDER', nil), 'version.properties'),
+              files: File.join(ENV['PROJECT_ROOT_FOLDER'], 'version.properties'),
               push: true
             )
           else
             Fastlane::Helper::GitHelper.commit(
               message: 'Bump version number',
-              files: File.join(ENV.fetch('PROJECT_ROOT_FOLDER', nil), ENV.fetch('PROJECT_NAME', nil), 'build.gradle'),
+              files: File.join(ENV['PROJECT_ROOT_FOLDER'], ENV['PROJECT_NAME'], 'build.gradle'),
               push: true
             )
           end

lib/fastlane/plugin/wpmreleasetoolkit/helper/android/android_tools_path_helper.rb

@@ -10,7 +10,7 @@ class ToolsPathHelper
         attr_reader :android_home
 
         def initialize(sdk_root: nil)
-          @android_home = sdk_root || ENV.fetch('ANDROID_HOME', nil) || ENV.fetch('ANDROID_SDK_ROOT', nil) || ENV.fetch('ANDROID_SDK', nil)
+          @android_home = sdk_root || ENV['ANDROID_HOME'] || ENV['ANDROID_SDK_ROOT'] || ENV['ANDROID_SDK']
         end
 
         # @param [String] binary The name of the binary to search for

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

@@ -467,7 +467,7 @@ def self.get_keyword_from_gradle_file(file_path, section, keyword)
         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?
-          File.join(ENV.fetch('PROJECT_ROOT_FOLDER', nil), ENV.fetch('PROJECT_NAME', nil), 'build.gradle')
+          File.join(ENV['PROJECT_ROOT_FOLDER'], ENV['PROJECT_NAME'], 'build.gradle')
         end
 
         # Update both the versionName and versionCode of the build.gradle file to the specified version.

lib/fastlane/plugin/wpmreleasetoolkit/helper/interactive_prompt_reminder.rb

@@ -84,7 +84,7 @@ def self.monkey_patch_interactive_prompts_with_reminder(after: DEFAULT_PROMPT_RE
 
 # Apply Monkey patch
 unless ENV['FASTLANE_PROMPT_REMINDER_DISABLE_AUTO_PATCH']
-  message = ENV.fetch('FASTLANE_PROMPT_REMINDER_MESSAGE', nil)
+  message = ENV['FASTLANE_PROMPT_REMINDER_MESSAGE']
   message = FastlaneCore::Shell::DEFAULT_PROMPT_REMINDER_MESSAGE if %w[default true yes 1].include?(message&.downcase)
   delays = ENV['FASTLANE_PROMPT_REMINDER_DELAYS']&.split(',')&.map(&:to_i) || FastlaneCore::Shell::DEFAULT_PROMPT_REMINDER_DELAYS
 

lib/fastlane/plugin/wpmreleasetoolkit/helper/ios/ios_git_helper.rb

@@ -18,11 +18,11 @@ module GitHelper
         # @param [Bool] include_metadata If true (the default), includes the `fastlane/download_metadata.swift` file and the `.pot` file (which typically contains an entry or release notes for the new version)
         #
         def self.commit_version_bump(include_deliverfile: true, include_metadata: true)
-          files_list = [File.join(ENV.fetch('PROJECT_ROOT_FOLDER', nil), 'config', '.')]
+          files_list = [File.join(ENV['PROJECT_ROOT_FOLDER'], 'config', '.')]
           files_list.append File.join('fastlane', 'Deliverfile') if include_deliverfile
           if include_metadata
             files_list.append File.join('fastlane', 'download_metadata.swift')
-            files_list.append File.join(ENV.fetch('PROJECT_ROOT_FOLDER', nil), ENV.fetch('PROJECT_NAME', nil), 'Resources', ENV.fetch('APP_STORE_STRINGS_FILE_NAME', nil))
+            files_list.append File.join(ENV['PROJECT_ROOT_FOLDER'], ENV['PROJECT_NAME'], 'Resources', ENV['APP_STORE_STRINGS_FILE_NAME'])
           end
 
           Fastlane::Helper::GitHelper.commit(message: 'Bump version number', files: files_list, push: true)

lib/fastlane/plugin/wpmreleasetoolkit/helper/ios/ios_version_helper.rb

@@ -219,7 +219,7 @@ def self.update_fastlane_deliver(new_version)
         # @param [String] internal_version The new version number to use as `VERSION_LONG` for the interrnal xcconfig file, if it exists
         #
         def self.update_xc_configs(new_version, new_version_short, internal_version)
-          update_xc_config(ENV.fetch('PUBLIC_CONFIG_FILE', nil), new_version, new_version_short)
+          update_xc_config(ENV['PUBLIC_CONFIG_FILE'], new_version, new_version_short)
           update_xc_config(ENV['INTERNAL_CONFIG_FILE'], internal_version, new_version_short) unless ENV['INTERNAL_CONFIG_FILE'].nil?
         end
 
@@ -311,7 +311,7 @@ def self.read_from_config_file(key, filePath)
         #         The second element is the version extracted from the internal config file, only present if one was provided.
         def self.get_version_strings
           version_strings = []
-          version_strings << read_long_version_from_config_file(ENV.fetch('PUBLIC_CONFIG_FILE', nil))
+          version_strings << read_long_version_from_config_file(ENV['PUBLIC_CONFIG_FILE'])
           version_strings << read_long_version_from_config_file(ENV['INTERNAL_CONFIG_FILE']) unless ENV['INTERNAL_CONFIG_FILE'].nil?
 
           return version_strings