Merge pull request #312 from wordpress-mobile/remove/drawtext-as-direct-dependency

Remove drawtext as direct dependency

Author: jkmassel

.buildkite/brewfile

@@ -1,7 +1,5 @@
 #!/bin/bash -eu
 
-.buildkite/install-dependencies.sh
-
 echo "--- :hammer: Build Gemspec"
 gem build fastlane-plugin-wpmreleasetoolkit.gemspec
 

.buildkite/gem-push.sh

@@ -1,9 +1,21 @@
 # Nodes with values to reuse in the pipeline.
 common_params:
-  plugins: &common_plugins
-  - &bash_cache automattic/bash-cache#2.0.0: ~
-  env: &common_env
+  env: &xcode_image
     IMAGE_ID: xcode-12.5.1
+  plugins:
+  - &docker_plugin
+    docker#v3.8.0:
+      image: &ruby_version "ruby:2.7.4"
+      propagate-environment: true
+      environment:
+        - "RUBYGEMS_API_KEY"
+  - &docker_plugin_with_danger_token
+    docker#v3.8.0:
+      image: *ruby_version
+      propagate-environment: true
+      environment:
+        - "DANGER_GITHUB_API_TOKEN"
+
 
 steps:
   #################
@@ -12,18 +24,20 @@ steps:
   - label: "🧪 Build and Test"
     key: test
     command: |
-      .buildkite/install-dependencies.sh
-
-      echo "--- :hammer: Build DrawText"
-      bundle exec rake compile
+      # We only need this for tasks running on a Mac
+      brew install pkg-config git-lfs libxml2 imagemagick@6
 
       echo "--- :git: Setting up git-lfs"
       git-lfs install
 
+      echo "--- :rubygems: Setting up Gems"
+      install_gems
+
       echo "--- :rspec: Run Rspec"
       bundle exec rspec --profile 10 --format progress
-    env: *common_env
-    plugins: *common_plugins
+    env: *xcode_image
+    plugins:
+      automattic/bash-cache#2.0.0: ~
     agents:
       queue: "mac"
 
@@ -33,29 +47,25 @@ steps:
   - label: "🧹 Lint (Rubocop)"
     key: rubocop
     command: |
-      .buildkite/install-dependencies.sh
-
+      bundle install
       echo "--- :rubocop: Run Rubocop"
       bundle exec rubocop
-    env: *common_env
-    plugins: *common_plugins
+    plugins: [*docker_plugin]
     agents:
-      queue: "mac"
+      queue: "default"
 
   #################
   # Danger
   #################
   - label: "⛔️ Danger"
     key: danger
     command: |
-      .buildkite/install-dependencies.sh
-
+      bundle install
       echo "--- :rubocop: Run Danger"
       bundle exec danger
-    env: *common_env
-    plugins: *common_plugins
+    plugins: [*docker_plugin_with_danger_token]
     agents:
-      queue: "mac"
+      queue: "default"
 
   #################
   # Push to RubyGems
@@ -71,7 +81,6 @@ steps:
     # commands written inline) to avoid leaking a key used in the process in clear in the
     # BUILDKITE_COMMAND environment variable.
     command: .buildkite/gem-push.sh
-    env: *common_env
-    plugins: *common_plugins
+    plugins: [*docker_plugin]
     agents:
-      queue: "mac"
+      queue: "default"

.buildkite/install-dependencies.sh

@@ -18,14 +18,6 @@ coverage/
 # YARD Documentation
 yard-doc/
 
-# DrawText
-lib/drawText
-lib/drawText.bundle
-ext/drawText/drawText.xcodeproj/xcuserdata
-ext/drawText/drawText.xcodeproj/project.xcworkspace/xcuserdata
-ext/drawText/test-output
-default.profraw
-
 # L10n Linter
 vendor/swiftgen
 

.buildkite/pipeline.yml

@@ -83,8 +83,6 @@ Naming/PredicateName:
 # SupportedStyles: snake_case, camelCase
 Naming/VariableName:
   Exclude:
-    - 'bin/drawText'
-    - 'ext/drawText/extconf.rb'
     - 'lib/fastlane/plugin/wpmreleasetoolkit/actions/common/promo_screenshots_action.rb'
     - 'lib/fastlane/plugin/wpmreleasetoolkit/actions/configure/configure_add_files_to_copy_action.rb'
     - 'lib/fastlane/plugin/wpmreleasetoolkit/actions/configure/configure_validate_action.rb'

.gitignore

@@ -6,7 +6,7 @@
 
 ### Breaking Changes
 
-_None_
+* Removes the `drawText` binary from the gem (instead depending on it being installed via `brew`). Because this update can not be safely applied with no side effects, it's considered a breaking change.
 
 ### New Features
 

.rubocop_todo.yml

@@ -30,17 +30,9 @@ task :docstats, [:path] do |_, args|
   sh('yard', 'stats', '--list-undoc', path)
 end
 
-Rake::ExtensionTask.new('drawText')
-
 GEM_NAME = 'fastlane-plugin-wpmreleasetoolkit'.freeze
 VERSION_FILE = File.join('lib', 'fastlane', 'plugin', 'wpmreleasetoolkit', 'version.rb')
 
-desc 'Try to build and install the gem to ensure it can be installed properly (with the native extension and all)'
-task :check_install_gem do
-  require_relative(VERSION_FILE)
-  check_install(Fastlane::Wpmreleasetoolkit::VERSION)
-end
-
 desc 'Create a new version of the release-toolkit gem'
 task :new_release do
   require_relative(VERSION_FILE)
@@ -66,10 +58,6 @@ task :new_release do
   Console.header 'Updating CHANGELOG...'
   parser.update_for_new_release(new_version: new_version)
 
-  ## Ensure the gem builds and is installable
-  Console.header 'Testing that the gem builds and installs...'
-  check_install(new_version)
-
   # Commit and push
   Console.header 'Commit and push changes...'
   GitHelper.commit_files("Bumped to version #{new_version}", [VERSION_FILE, 'Gemfile.lock', 'CHANGELOG.md'])
@@ -100,10 +88,3 @@ def update_version_constant(version_file, new_version)
 
   sh('bundle', 'install', '--quiet') # To update Gemfile.lock with new wpmreleasetoolkit version
 end
-
-def check_install(version)
-  sh('gem', 'build', "#{GEM_NAME}.gemspec")
-  Dir.mktmpdir('release-toolkit-') do |tmpdir|
-    sh('gem', 'install', '--install-dir', tmpdir, '--silent', '--no-document', "#{GEM_NAME}-#{version}.gem")
-  end
-end