From 6476c0c1f63a62305acaf06e8d2fbf52dab28c48 Mon Sep 17 00:00:00 2001 From: Olivier Halligon Date: Fri, 22 Oct 2021 17:09:23 +0200 Subject: [PATCH 1/3] Bumped to version 2.1.0 --- CHANGELOG.md | 12 +++++++++++- Gemfile.lock | 8 +++----- lib/fastlane/plugin/wpmreleasetoolkit/version.rb | 2 +- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 45b084584..83cb08c44 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,7 @@ _None_ ### New Features -* Added a reminder mechanism for when you forgot a prompt was waiting for you in the Terminal. This reminder is [configurable via environment variables](https://github.com/wordpress-mobile/release-toolkit/blob/5c9b79db4bfcb298376fe3e81bc53881795922a5/lib/fastlane/plugin/wpmreleasetoolkit/helper/interactive_prompt_reminder.rb#L3-L22) to change the default delays and optionally opt-in for speaking a voice message in addition to the default beep + dock icon badge. [#302] +_None_ ### Bug Fixes @@ -18,6 +18,16 @@ _None_ ### Internal Changes +_None_ + +## 2.1.0 + +### New Features + +* Added a reminder mechanism for when you forgot a prompt was waiting for you in the Terminal. This reminder is [configurable via environment variables](https://github.com/wordpress-mobile/release-toolkit/blob/5c9b79db4bfcb298376fe3e81bc53881795922a5/lib/fastlane/plugin/wpmreleasetoolkit/helper/interactive_prompt_reminder.rb#L3-L22) to change the default delays and optionally opt-in for speaking a voice message in addition to the default beep + dock icon badge. [#302] + +### Internal Changes + - Replace CircleCI and GitHub Actions with Buildkite ## 2.0.0 diff --git a/Gemfile.lock b/Gemfile.lock index d58a185ef..8a28ebcee 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - fastlane-plugin-wpmreleasetoolkit (2.0.0) + fastlane-plugin-wpmreleasetoolkit (2.1.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.27 + 2.2.29 diff --git a/lib/fastlane/plugin/wpmreleasetoolkit/version.rb b/lib/fastlane/plugin/wpmreleasetoolkit/version.rb index b95d4af53..622665fdc 100644 --- a/lib/fastlane/plugin/wpmreleasetoolkit/version.rb +++ b/lib/fastlane/plugin/wpmreleasetoolkit/version.rb @@ -1,5 +1,5 @@ module Fastlane module Wpmreleasetoolkit - VERSION = '2.0.0' + VERSION = '2.1.0' end end From fd1a15d9f2a20d23988bf362923cabacbfaa0d9e Mon Sep 17 00:00:00 2001 From: Olivier Halligon Date: Fri, 22 Oct 2021 17:24:45 +0200 Subject: [PATCH 2/3] Extract common steps to install dependencies Ensuring that all steps install not only the gems but also the brew dependencies needed to install those gems (esp. rmagick) --- .buildkite/gem-push.sh | 6 +----- .buildkite/install-dependencies.sh | 7 +++++++ .buildkite/pipeline.yml | 12 +++--------- 3 files changed, 11 insertions(+), 14 deletions(-) create mode 100755 .buildkite/install-dependencies.sh diff --git a/.buildkite/gem-push.sh b/.buildkite/gem-push.sh index 44999de32..1e6aa00ac 100755 --- a/.buildkite/gem-push.sh +++ b/.buildkite/gem-push.sh @@ -1,10 +1,6 @@ #!/bin/bash -eu -echo "--- :beer: Installing Dependencies" -brew bundle --file .buildkite/brewfile - -echo "--- :rubygems: Setting up Gems" -install_gems +./install-dependencies.sh echo "--- :hammer: Build Gemspec" gem build fastlane-plugin-wpmreleasetoolkit.gemspec diff --git a/.buildkite/install-dependencies.sh b/.buildkite/install-dependencies.sh new file mode 100755 index 000000000..70ec580e4 --- /dev/null +++ b/.buildkite/install-dependencies.sh @@ -0,0 +1,7 @@ +#!/bin/bash -eu + +echo "--- :beer: Installing Dependencies" +brew bundle --file .buildkite/brewfile + +echo "--- :rubygems: Setting up Gems" +install_gems diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 42b75e3c4..f630995df 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -12,11 +12,7 @@ steps: - label: "🧪 Build and Test" key: "test" command: | - echo "--- :beer: Installing Dependencies" - brew bundle --file .buildkite/brewfile - - echo "--- :rubygems: Setting up Gems" - install_gems + .buildkite/install-dependencies.sh echo "--- :hammer: Build DrawText" bundle exec rake compile @@ -36,8 +32,7 @@ steps: ################# - label: "🧹 Lint" command: | - echo "--- :rubygems: Setting up Gems" - install_gems + .buildkite/install-dependencies.sh echo "--- :rubocop: Run Rubocop" bundle exec rubocop @@ -51,8 +46,7 @@ steps: ################# - label: "⛔️ Danger" command: | - echo "--- :rubygems: Setting up Gems" - install_gems + .buildkite/install-dependencies.sh echo "--- :rubocop: Run Danger" bundle exec danger From a229cfa6c849c47d6c4684ab930b515d8c4b56cb Mon Sep 17 00:00:00 2001 From: Olivier Halligon Date: Fri, 22 Oct 2021 18:34:26 +0200 Subject: [PATCH 3/3] Fix path to install-dependencies from gem-push Because the script is always called from the root of the repo, via `.buildkite/gem-push`, as opposed to us `cd`-ing into the `.buildkite` dir to run the `gem-push.sh` script, so the `$PWD` is still the repo root in that context. --- .buildkite/gem-push.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.buildkite/gem-push.sh b/.buildkite/gem-push.sh index 1e6aa00ac..bd070873c 100755 --- a/.buildkite/gem-push.sh +++ b/.buildkite/gem-push.sh @@ -1,6 +1,6 @@ #!/bin/bash -eu -./install-dependencies.sh +.buildkite/install-dependencies.sh echo "--- :hammer: Build Gemspec" gem build fastlane-plugin-wpmreleasetoolkit.gemspec