Skip to content

Update dependency fastlane-plugin-wpmreleasetoolkit to v11 #20922

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iangmaia merged 4 commits into from
Jun 17, 2024
Merged

Update dependency fastlane-plugin-wpmreleasetoolkit to v11 #20922

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6b55e13
Update dependency fastlane-plugin-wpmreleasetoolkit to v11
renovate[bot] May 31, 2024
2317280
Update fastlane-plugin-wpmreleasetoolkit to `11.0.2`
iangmaia Jun 14, 2024
d20a7bf
Adjust to release-toolkit new action names
iangmaia Jun 14, 2024
a378a5e
Use `copy_branch_protection` instead of `set_branch_protection`
iangmaia Jun 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ gem 'nokogiri'
### Fastlane Plugins

gem 'fastlane-plugin-sentry'
gem 'fastlane-plugin-wpmreleasetoolkit', '~> 9.2'
gem 'fastlane-plugin-wpmreleasetoolkit', '~> 11.0'

@AliSoftware AliSoftware Jun 4, 2024 •
edited by iangmaia
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See https://github.com/wordpress-mobile/release-toolkit/blob/trunk/MIGRATION.md

  • Project uses ruby version 3.2.2 ➡️ yes
  • setbranchprotection renamed to set_branch_protection, with copy_branch_protection(from:…) being usually even a better replacement for it ➡️ ❌ Used in fastlane/lanes/release.rb:79
  • removebranchprotection renamed remove_branch_protection ➡️ ❌ Used in fastlane/lanes/release.rb:296
  • setfrozentag renamed set_milestone_frozen_marker ➡️ ❌ Used in fastlane/lanes/release.rb:80 and in fastlane/lanes/release.rb:318
  • ios_clear_intermediate_tags and ios_final_tag actions removed: Not applicable for Android projects
  • has_alpha_version removed ➡️ ✅ Not used
  • project_name and project_root_folder removed ➡️ ✅ Not used
  • update_pull_requests_milestone renamed to update_assigned_milestone (+ parameters renamed) ➡️ ✅ Not used
  • ios_check_beta_deps parameter updated: N/A to Android projects

@iangmaia iangmaia Jun 14, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've updated the calls to be in line with the release-toolkit version 11.0.2 (cc @wzieba)

# gem 'fastlane-plugin-wpmreleasetoolkit', path: '../../release-toolkit'
# gem 'fastlane-plugin-wpmreleasetoolkit', git: 'https://github.com/wordpress-mobile/release-toolkit', branch: ''

Expand Down
78 changes: 38 additions & 40 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ GEM
base64
nkf
rexml
activesupport (7.1.3)
activesupport (7.1.3.4)
base64
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
Expand All @@ -17,30 +17,29 @@ GEM
tzinfo (~> 2.0)
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
artifactory (3.0.15)
artifactory (3.0.17)
ast (2.4.2)
atomos (0.1.3)
aws-eventstream (1.3.0)
aws-partitions (1.894.0)
aws-sdk-core (3.191.2)
aws-partitions (1.944.0)
aws-sdk-core (3.197.0)
aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.651.0)
aws-sigv4 (~> 1.8)
base64
jmespath (~> 1, >= 1.6.1)
aws-sdk-kms (1.77.0)
aws-sdk-core (~> 3, >= 3.191.0)
aws-sdk-kms (1.84.0)
aws-sdk-core (~> 3, >= 3.197.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.143.0)
aws-sdk-core (~> 3, >= 3.191.0)
aws-sdk-s3 (1.152.3)
aws-sdk-core (~> 3, >= 3.197.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.8)
aws-sigv4 (1.8.0)
aws-eventstream (~> 1, >= 1.0.2)
babosa (1.0.4)
base64 (0.2.0)
bigdecimal (3.1.6)
buildkit (1.5.0)
bigdecimal (3.1.8)
buildkit (1.6.0)
sawyer (>= 0.6)
chroma (0.2.0)
claide (1.1.0)
Expand All @@ -52,7 +51,7 @@ GEM
colored2 (3.1.2)
commander (4.6.0)
highline (~> 2.0.0)
concurrent-ruby (1.2.3)
concurrent-ruby (1.3.3)
connection_pool (2.4.1)
cork (0.3.0)
colored2 (~> 3.1)
Expand Down Expand Up @@ -85,10 +84,9 @@ GEM
rake (>= 12.0.0, < 14.0.0)
domain_name (0.6.20240107)
dotenv (2.8.1)
drb (2.2.0)
ruby2_keywords
drb (2.2.1)
emoji_regex (3.2.3)
excon (0.109.0)
excon (0.110.0)
faraday (1.10.3)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
Expand Down Expand Up @@ -119,15 +117,15 @@ GEM
faraday-retry (1.0.3)
faraday_middleware (1.2.0)
faraday (~> 1.0)
fastimage (2.3.0)
fastlane (2.219.0)
fastimage (2.3.1)
fastlane (2.220.0)
CFPropertyList (>= 2.3, < 4.0.0)
addressable (>= 2.8, < 3.0.0)
artifactory (~> 3.0)
aws-sdk-s3 (~> 1.0)
babosa (>= 1.0.3, < 2.0.0)
bundler (>= 1.12.0, < 3.0.0)
colored
colored (~> 1.2)
commander (~> 4.6)
dotenv (>= 2.1.1, < 3.0.0)
emoji_regex (>= 0.1, < 4.0)
Expand All @@ -148,10 +146,10 @@ GEM
mini_magick (>= 4.9.4, < 5.0.0)
multipart-post (>= 2.0.0, < 3.0.0)
naturally (~> 2.2)
optparse (>= 0.1.1)
optparse (>= 0.1.1, < 1.0.0)
plist (>= 3.1.0, < 4.0.0)
rubyzip (>= 2.0.0, < 3.0.0)
security (= 0.1.3)
security (= 0.1.5)
simctl (~> 1.6.3)
terminal-notifier (>= 2.0.0, < 3.0.0)
terminal-table (~> 3)
Expand All @@ -160,10 +158,10 @@ GEM
word_wrap (~> 1.0.0)
xcodeproj (>= 1.13.0, < 2.0.0)
xcpretty (~> 0.3.0)
xcpretty-travis-formatter (>= 0.0.3)
xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
fastlane-plugin-sentry (1.19.0)
os (~> 1.1, >= 1.1.4)
fastlane-plugin-wpmreleasetoolkit (9.4.0)
fastlane-plugin-wpmreleasetoolkit (11.0.2)
activesupport (>= 6.1.7.1)
buildkit (~> 1.5)
chroma (= 0.2.0)
Expand All @@ -172,7 +170,7 @@ GEM
git (~> 1.3)
google-cloud-storage (~> 1.31)
java-properties (~> 0.3.0)
nokogiri (~> 1.11, < 1.16)
nokogiri (~> 1.11, < 1.17)
octokit (~> 6.1)
parallel (~> 1.14)
plist (~> 3.1)
Expand Down Expand Up @@ -200,12 +198,12 @@ GEM
google-apis-core (>= 0.11.0, < 2.a)
google-apis-storage_v1 (0.31.0)
google-apis-core (>= 0.11.0, < 2.a)
google-cloud-core (1.6.1)
google-cloud-core (1.7.0)
google-cloud-env (>= 1.0, < 3.a)
google-cloud-errors (~> 1.0)
google-cloud-env (1.6.0)
faraday (>= 0.17.3, < 3.0)
google-cloud-errors (1.3.1)
google-cloud-errors (1.4.0)
google-cloud-storage (1.47.0)
addressable (~> 2.8)
digest-crc (~> 0.4)
Expand All @@ -221,25 +219,25 @@ GEM
os (>= 0.9, < 2.0)
signet (>= 0.16, < 2.a)
highline (2.0.3)
http-cookie (1.0.5)
http-cookie (1.0.6)
domain_name (~> 0.5)
httpclient (2.8.3)
i18n (1.14.1)
i18n (1.14.5)
concurrent-ruby (~> 1.0)
java-properties (0.3.0)
jmespath (1.6.2)
json (2.7.2)
jwt (2.8.0)
jwt (2.8.1)
base64
kramdown (2.4.0)
rexml
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
language_server-protocol (3.17.0.3)
mini_magick (4.12.0)
mini_magick (4.13.0)
mini_mime (1.1.5)
mini_portile2 (2.8.5)
minitest (5.22.2)
mini_portile2 (2.8.7)
minitest (5.23.1)
multi_json (1.15.0)
multipart-post (2.4.1)
mutex_m (0.2.0)
Expand All @@ -248,23 +246,23 @@ GEM
naturally (2.2.1)
nkf (0.2.0)
no_proxy_fix (0.1.2)
nokogiri (1.15.5)
nokogiri (1.16.6)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
octokit (6.1.1)
faraday (>= 1, < 3)
sawyer (~> 0.9)
open4 (1.3.4)
options (2.3.2)
optparse (0.4.0)
optparse (0.5.0)
os (1.1.4)
parallel (1.24.0)
parallel (1.25.1)
parser (3.3.2.0)
ast (~> 2.4.1)
racc
plist (3.7.1)
progress_bar (1.3.3)
highline (>= 1.6, < 3)
progress_bar (1.3.4)
highline (>= 1.6)
options (~> 2.3.0)
public_suffix (5.0.5)
racc (1.8.0)
Expand All @@ -279,8 +277,8 @@ GEM
trailblazer-option (>= 0.1.1, < 0.2.0)
uber (< 0.2.0)
retriable (3.1.2)
rexml (3.2.8)
strscan (>= 3.0.9)
rexml (3.2.9)
strscan
rmagick (4.3.0)
rouge (2.0.7)
rubocop (1.64.1)
Expand All @@ -302,7 +300,7 @@ GEM
sawyer (0.9.2)
addressable (>= 2.3.5)
faraday (>= 0.17.3, < 3)
security (0.1.3)
security (0.1.5)
signet (0.19.0)
addressable (~> 2.8)
faraday (>= 0.17.5, < 3.a)
Expand Down Expand Up @@ -344,7 +342,7 @@ DEPENDENCIES
danger-dangermattic (~> 1.0)
fastlane (~> 2)
fastlane-plugin-sentry
fastlane-plugin-wpmreleasetoolkit (~> 9.2)
fastlane-plugin-wpmreleasetoolkit (~> 11.0)
nokogiri
rmagick (~> 4.1)

Expand Down
12 changes: 8 additions & 4 deletions fastlane/lanes/release.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,12 @@

push_to_git_remote(tags: false)

setbranchprotection(repository: GHHELPER_REPO, branch: "release/#{new_version}")
setfrozentag(repository: GHHELPER_REPO, milestone: new_version)
copy_branch_protection(
repository: GHHELPER_REPO,
from_branch: DEFAULT_BRANCH,
to_branch: "release/#{new_version}"
)
set_milestone_frozen_marker(repository: GHHELPER_REPO, milestone: new_version)
end

#####################################################################################
Expand Down Expand Up @@ -293,7 +297,7 @@
release_branch = "release/#{current_release_version}"

# Remove branch protection first, so that we can push the final commits directly to the release branch
removebranchprotection(repository: GHHELPER_REPO, branch: release_branch)
remove_branch_protection(repository: GHHELPER_REPO, branch: release_branch)

# Don't check translation coverage for now since we are finalizing the release in CI
# check_translations_coverage
Expand All @@ -315,7 +319,7 @@
push_to_git_remote(tags: false)

# Wrap up
setfrozentag(repository: GHHELPER_REPO, milestone: version_name, freeze: false)
set_milestone_frozen_marker(repository: GHHELPER_REPO, milestone: version_name, freeze: false)
create_new_milestone(repository: GHHELPER_REPO)
close_milestone(repository: GHHELPER_REPO, milestone: version_name)

Expand Down