Merge branch 'trunk' into remove/drawtext-as-direct-dependency

Author: jkmassel

.buildkite/pipeline.yml

@@ -19,7 +19,7 @@ steps:
   # Build and Test
   #################
   - label: "🧪 Build and Test"
-    key: "test"
+    key: test
     command: |
       # We only need this for tasks running on a Mac
       brew install pkg-config git-lfs libxml2 imagemagick@6
@@ -35,14 +35,15 @@ steps:
     env: 
       IMAGE_ID: xcode-12.5.1
     plugins:
-      automattic/bash-cache#v1.3.2: ~
+      automattic/bash-cache#2.0.0: ~
     agents:
       queue: "mac"
 
   #################
   # Lint
   #################
-  - label: "🧹 Lint"
+  - label: "🧹 Lint (Rubocop)"
+    key: rubocop
     command: |
       bundle install
       echo "--- :rubocop: Run Rubocop"
@@ -55,6 +56,7 @@ steps:
   # Danger
   #################
   - label: "⛔️ Danger"
+    key: danger
     command: |
       bundle install
       echo "--- :rubocop: Run Danger"
@@ -69,6 +71,10 @@ steps:
   - label: ":rubygems: Publish to RubyGems"
     key: "gem-push"
     if: build.tag != null
+    depends_on:
+     - test
+     - rubocop
+     - danger
     # Note: We intentionally call a separate `.sh` script here (as opposed to having all the 
     # commands written inline) to avoid leaking a key used in the process in clear in the
     # BUILDKITE_COMMAND environment variable.

.rubocop_todo.yml

@@ -482,3 +482,7 @@ Style/ZeroLengthPredicate:
     - 'lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/add_devices_to_provisioning_profiles.rb'
     - 'lib/fastlane/plugin/wpmreleasetoolkit/helper/git_helper.rb'
     - 'lib/fastlane/plugin/wpmreleasetoolkit/helper/metadata_download_helper.rb'
+
+Style/ClassVars:
+  Exclude:
+    - 'lib/fastlane/plugin/wpmreleasetoolkit/helper/github_helper.rb'

CHANGELOG.md

@@ -10,15 +10,35 @@
 
 ### New Features
 
-* Added a new `ios_generate_strings_file_from_code` action to replace the now-deprecated `ios_localize_project` action (and `Scripts/localize.py` script in app repos). [#309, #311]
+_None_
 
 ### Bug Fixes
 
 _None_
 
 ### Internal Changes
 
-_None_
+* Ensure that the `gem push` step only runs on CI if lint, test and danger steps passed before it. [#325]
+
+## 2.3.0
+
+### New Features
+
+* Added parameter for default/base branch across several actions [#319]
+
+## 2.2.0
+
+### New Features
+
+* Added a new `ios_generate_strings_file_from_code` action to replace the now-deprecated `ios_localize_project` action (and `Scripts/localize.py` script in app repos). [#309, #311]
+* Added a `comment_on_pr` action to allow commenting on (and updating comments on) PRs. [#313]
+* Added the ability to use the `GITHUB_TOKEN` environment variable for GitHub operations. `GHHELPER_ACCESS` will be deprecated in a future version. [#313]
+* Added support for downloading GitHub content for private repositories [#321]
+
+### Bug Fixes
+
+* Fixed the rendering of PR links in the body of GitHub Releases created via the `create_release` action. [#316]
+* Fixed a bug introduced in [#313] that caused the GitHub helper not to work [#318]
 
 ## 2.1.0
 

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fastlane-plugin-wpmreleasetoolkit (2.1.0)
+    fastlane-plugin-wpmreleasetoolkit (2.3.0)
       activesupport (~> 5)
       bigdecimal (~> 1.4)
       chroma (= 0.2.0)
@@ -267,7 +267,6 @@ GEM
     method_source (0.9.2)
     mini_magick (4.11.0)
     mini_mime (1.1.2)
-    mini_portile2 (2.6.1)
     minitest (5.14.4)
     molinillo (0.8.0)
     multi_json (1.15.0)
@@ -277,8 +276,7 @@ GEM
     naturally (2.2.1)
     netrc (0.11.0)
     no_proxy_fix (0.1.2)
-    nokogiri (1.12.5)
-      mini_portile2 (~> 2.6.1)
+    nokogiri (1.12.5-x86_64-darwin)
       racc (~> 1.4)
     octokit (4.21.0)
       faraday (>= 0.9)
@@ -426,4 +424,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   2.2.31
+   2.2.33

Rakefile

@@ -62,8 +62,7 @@ task :new_release do
   Console.header 'Commit and push changes...'
   GitHelper.commit_files("Bumped to version #{new_version}", [VERSION_FILE, 'Gemfile.lock', 'CHANGELOG.md'])
 
-  Console.header 'Opening PR drafts in your default browser...'
-  GitHelper.prepare_github_pr("release/#{new_version}", 'develop', "Release #{new_version} into develop", "New version #{new_version}")
+  Console.header 'Opening PR draft in your default browser...'
   GitHelper.prepare_github_pr("release/#{new_version}", 'trunk', "Release #{new_version} into trunk", "New version #{new_version}. Be sure to create a GitHub Release and tag once this PR gets merged.")
 
   Console.info <<~INSTRUCTIONS
@@ -72,8 +71,8 @@ task :new_release do
 
     >>> WHAT'S NEXT
 
-    1. Create PRs to `develop` and `trunk`.
-    2. Once the PRs are merged, publish a GitHub release for \`#{new_version}\`, targeting \`trunk\`,
+    1. Create a PR against `trunk`.
+    2. Once the PR is merged, publish a GitHub release for \`#{new_version}\`, targeting \`trunk\`,
        creating a new \`#{new_version} tag in the process.
 
     The creation of the new tag will trigger a CI workflow that will take care of doing the

docs/screenshot-compositor.md

@@ -23,7 +23,7 @@ This argument is a path to the directory containing the screenshots, typically g
 
 **`metadata_folder`**
 
-This argument is a path to the directory containing any metadata, such as localized strings for use on the final screenshots. This directory should contain subdirectories named after locales. 
+This argument is a path to the directory containing any metadata, such as localized strings for use on the final screenshots. This directory should contain subdirectories named after locales.
 
 > Note: The tool will automatically check these directories, and will be default use any locales found in both directories.
 
@@ -43,7 +43,7 @@ The tool uses a `.json` file for configuration. By default, the tool will attemp
 
 The following sample implementations provide a good example of how to create a configuration file:
 
-- [WordPress Android](https://github.com/wordpress-mobile/WordPress-Android/blob/develop/fastlane/screenshots.json)
+- [WordPress Android](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/fastlane/screenshots.json)
 
 ## Creating a configuration file
 
@@ -160,7 +160,7 @@ Entries specify the set of output screenshots. This takes the form of an array o
 
 > Note: There is a 1:1 relationship between entries and the final screenshots. Note that it is not necessary to create a set of entries for each locale – this is automatically handled for you.
 
-Each entry looks something like this: 
+Each entry looks something like this:
 
 ```json
 {
@@ -251,19 +251,19 @@ Specifies a list of attachments, which can be images or text. They are composite
 ```
 Text attachments use the following keys:
 
-**`text`** 
+**`text`**
 
 Specifies the path to the text file for this attachment. The path should be specified relative to the configuration file, and can contain the `{locale}` placeholder to allow for localization.
 
-**`size`** 
+**`size`**
 
-Sets the dimensions of the text bounding box within the final image. This must be provided as an array with two values corresponding to the width and height, respectively. If the size is too small, the compositor will crash saying it was unable to draw the text in an area this small. The text will be horizontally and vertically centered within the bounding box. 
+Sets the dimensions of the text bounding box within the final image. This must be provided as an array with two values corresponding to the width and height, respectively. If the size is too small, the compositor will crash saying it was unable to draw the text in an area this small. The text will be horizontally and vertically centered within the bounding box.
 
-**`position`** 
+**`position`**
 
 Sets the origin of the text bounding box within the final image. This must be provided as an array with two values corresponding to the x and y coordinates, respectively.
 
-**`font-size`** 
+**`font-size`**
 
 Specifies the font size for the text of this attachment. If this number is too large, such that it doesn't fit into the bounding box described by the `size` key, the compositor will exit with an error message.
 
@@ -282,19 +282,19 @@ Specifies a stylesheet used for this attachment. It should contain a path to the
 
 Image attachments use the following keys:
 
-**`file`** 
+**`file`**
 
 Specifies the path to the attachment image. The path should be specified relative to the configuration file, and can contain the `{locale}` placeholder to allow for localization.
 
-**`size`** 
+**`size`**
 
 Sets the dimensions of the attachment within the final image. This must be provided as an array with two values corresponding to the width and height, respectively.
 
-**`position`** 
+**`position`**
 
 Sets the origin of the attachment within the final image. This must be provided as an array with two values corresponding to the x and y coordinates, respectively.
 
-**`operations`** 
+**`operations`**
 
 Specifies a set of operations to perform on the attachment prior to drawing it to the canvas. Operations run in the order they're specified within the configuration file. Operations are defined as an array of hashes. For example:
 
@@ -308,18 +308,18 @@ Specifies a set of operations to perform on the attachment prior to drawing it t
 
 They use the following keys:
 
-**`type`** 
+**`type`**
 
 Describes the type of operation. Currently `crop` is the only operation that can be specified.
 
 **Operations**
 
 *Crop* allows you to crop the image using two keys:
 
-**`at`** 
+**`at`**
 
 Specifies the origin point crop bounding box. This must be provided as an array with two values corresponding to the x and y coordinates, respectively.
 
-**`to`** 
+**`to`**
 
 Specifies the dimensions of the crop bounding box. This must be provided as an array with two values corresponding to the width and height, respectively.

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

@@ -8,8 +8,9 @@ def self.run(params)
         require_relative '../../helper/android/android_version_helper'
         require_relative '../../helper/android/android_git_helper'
 
-        # Checkout develop and update
-        Fastlane::Helper::GitHelper.checkout_and_pull('develop')
+        # Checkout default branch and update
+        default_branch = params[:default_branch]
+        Fastlane::Helper::GitHelper.checkout_and_pull(default_branch)
 
         # Check versions
         release_version = Fastlane::Helper::Android::VersionHelper.get_release_version
@@ -80,6 +81,11 @@ def self.available_options
                                        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
+          FastlaneCore::ConfigItem.new(key: :default_branch,
+                                       env_name: 'FL_RELEASE_TOOLKIT_DEFAULT_BRANCH',
+                                       description: 'Default branch of the repository',
+                                       type: String,
+                                       default_value: Fastlane::Helper::GitHelper::DEFAULT_GIT_BRANCH),
         ]
       end
 

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

@@ -8,7 +8,8 @@ def self.run(params)
         require_relative '../../helper/android/android_version_helper'
         require_relative '../../helper/android/android_git_helper'
 
-        other_action.ensure_git_branch(branch: 'develop')
+        default_branch = params[:default_branch]
+        other_action.ensure_git_branch(branch: default_branch)
 
         # Create new configuration
         new_short_version = Fastlane::Helper::Android::VersionHelper.bump_version_release
@@ -28,9 +29,9 @@ def self.run(params)
         UI.message("New version: #{new_short_version}")
         UI.message("Release branch: #{new_release_branch}")
 
-        # Update local develop and branch
+        # Update local default branch and create branch from it
         UI.message 'Creating new branch...'
-        Fastlane::Helper::GitHelper.create_branch(new_release_branch, from: 'develop')
+        Fastlane::Helper::GitHelper.create_branch(new_release_branch, from: default_branch)
         UI.message 'Done!'
 
         UI.message 'Updating app version...'
@@ -52,7 +53,13 @@ def self.details
       end
 
       def self.available_options
-        # Define all options your action supports.
+        [
+          FastlaneCore::ConfigItem.new(key: :default_branch,
+                                       env_name: 'FL_RELEASE_TOOLKIT_DEFAULT_BRANCH',
+                                       description: 'Default branch of the repository',
+                                       type: String,
+                                       default_value: Fastlane::Helper::GitHelper::DEFAULT_GIT_BRANCH),
+        ]
       end
 
       def self.output

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

@@ -11,8 +11,9 @@ def self.run(params)
         require_relative '../../helper/android/android_version_helper'
         require_relative '../../helper/android/android_git_helper'
 
-        # Checkout develop and update
-        Fastlane::Helper::GitHelper.checkout_and_pull('develop')
+        # Checkout default branch and update
+        default_branch = params[:default_branch]
+        Fastlane::Helper::GitHelper.checkout_and_pull(default_branch)
 
         # Create versions
         current_version = Fastlane::Helper::Android::VersionHelper.get_release_version
@@ -23,7 +24,7 @@ def self.run(params)
         no_alpha_version_message = "No alpha version configured. If you wish to configure an alpha version please update version.properties to include an alpha key for this app\n"
         # Ask user confirmation
         unless params[:skip_confirm]
-          confirm_message = "Building a new release branch starting from develop.\nCurrent version is #{current_version[Fastlane::Helper::Android::VersionHelper::VERSION_NAME]} (#{current_version[Fastlane::Helper::Android::VersionHelper::VERSION_CODE]}).\n"
+          confirm_message = "Building a new release branch starting from #{default_branch}.\nCurrent version is #{current_version[Fastlane::Helper::Android::VersionHelper::VERSION_NAME]} (#{current_version[Fastlane::Helper::Android::VersionHelper::VERSION_CODE]}).\n"
           confirm_message += current_alpha_version.nil? ? no_alpha_version_message : "Current Alpha version is #{current_alpha_version[Fastlane::Helper::Android::VersionHelper::VERSION_NAME]} (#{current_alpha_version[Fastlane::Helper::Android::VersionHelper::VERSION_CODE]}).\n"
           confirm_message += "After codefreeze the new version will be: #{next_version[Fastlane::Helper::Android::VersionHelper::VERSION_NAME]} (#{next_version[Fastlane::Helper::Android::VersionHelper::VERSION_CODE]}).\n"
           confirm_message += current_alpha_version.nil? ? '' : "After codefreeze the new Alpha will be: #{next_alpha_version[Fastlane::Helper::Android::VersionHelper::VERSION_NAME]} (#{next_alpha_version[Fastlane::Helper::Android::VersionHelper::VERSION_CODE]}).\n"
@@ -47,7 +48,7 @@ def self.description
       end
 
       def self.details
-        'Updates the develop branch, checks the app version and ensure the branch is clean'
+        'Updates the default branch, checks the app version and ensure the branch is clean'
       end
 
       def self.available_options
@@ -58,6 +59,11 @@ def self.available_options
                                        description: 'Skips confirmation before codefreeze',
                                        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
+          FastlaneCore::ConfigItem.new(key: :default_branch,
+                                       env_name: 'FL_RELEASE_TOOLKIT_DEFAULT_BRANCH',
+                                       description: 'Default branch of the repository',
+                                       type: String,
+                                       default_value: Fastlane::Helper::GitHelper::DEFAULT_GIT_BRANCH),
         ]
       end