From 6b55e13e9edce01ed1252b9574e0139c4c181f4f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 31 May 2024 10:21:36 +0000 Subject: [PATCH 1/4] Update dependency fastlane-plugin-wpmreleasetoolkit to v11 --- Gemfile | 2 +- Gemfile.lock | 68 +++++++++++++++++++++++++--------------------------- 2 files changed, 34 insertions(+), 36 deletions(-) diff --git a/Gemfile b/Gemfile index e64e0667d18c..734bb6e959ab 100644 --- a/Gemfile +++ b/Gemfile @@ -9,7 +9,7 @@ gem 'nokogiri' ### Fastlane Plugins gem 'fastlane-plugin-sentry' -gem 'fastlane-plugin-wpmreleasetoolkit', '~> 9.2' +gem 'fastlane-plugin-wpmreleasetoolkit', '~> 11.0' # gem 'fastlane-plugin-wpmreleasetoolkit', path: '../../release-toolkit' # gem 'fastlane-plugin-wpmreleasetoolkit', git: 'https://github.com/wordpress-mobile/release-toolkit', branch: '' diff --git a/Gemfile.lock b/Gemfile.lock index 5222314be129..63531764df18 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -5,7 +5,7 @@ GEM base64 nkf rexml - activesupport (7.1.3) + activesupport (7.1.3.3) base64 bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) @@ -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.937.0) + aws-sdk-core (3.196.1) 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.82.0) + aws-sdk-core (~> 3, >= 3.193.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.143.0) - aws-sdk-core (~> 3, >= 3.191.0) + aws-sdk-s3 (1.151.0) + aws-sdk-core (~> 3, >= 3.194.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) @@ -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.1) connection_pool (2.4.1) cork (0.3.0) colored2 (~> 3.1) @@ -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) @@ -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) @@ -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) @@ -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.1) activesupport (>= 6.1.7.1) buildkit (~> 1.5) chroma (= 0.2.0) @@ -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) @@ -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) @@ -224,12 +222,12 @@ GEM http-cookie (1.0.5) 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 @@ -238,8 +236,8 @@ GEM language_server-protocol (3.17.0.3) mini_magick (4.12.0) mini_mime (1.1.5) - mini_portile2 (2.8.5) - minitest (5.22.2) + mini_portile2 (2.8.6) + minitest (5.23.1) multi_json (1.15.0) multipart-post (2.4.1) mutex_m (0.2.0) @@ -248,7 +246,7 @@ GEM naturally (2.2.1) nkf (0.2.0) no_proxy_fix (0.1.2) - nokogiri (1.15.5) + nokogiri (1.16.5) mini_portile2 (~> 2.8.2) racc (~> 1.4) octokit (6.1.1) @@ -256,15 +254,15 @@ GEM 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) 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) @@ -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) @@ -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) From 231728075d33dea99ffa15c75e929dd94b43a464 Mon Sep 17 00:00:00 2001 From: Ian Maia Date: Fri, 14 Jun 2024 12:05:35 +0200 Subject: [PATCH 2/4] Update fastlane-plugin-wpmreleasetoolkit to `11.0.2` --- Gemfile.lock | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 63531764df18..9f729ce44ab1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -5,7 +5,7 @@ GEM base64 nkf rexml - activesupport (7.1.3.3) + activesupport (7.1.3.4) base64 bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) @@ -21,17 +21,17 @@ GEM ast (2.4.2) atomos (0.1.3) aws-eventstream (1.3.0) - aws-partitions (1.937.0) - aws-sdk-core (3.196.1) + 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) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.82.0) - aws-sdk-core (~> 3, >= 3.193.0) + aws-sdk-kms (1.84.0) + aws-sdk-core (~> 3, >= 3.197.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.151.0) - aws-sdk-core (~> 3, >= 3.194.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) @@ -51,7 +51,7 @@ GEM colored2 (3.1.2) commander (4.6.0) highline (~> 2.0.0) - concurrent-ruby (1.3.1) + concurrent-ruby (1.3.3) connection_pool (2.4.1) cork (0.3.0) colored2 (~> 3.1) @@ -161,7 +161,7 @@ GEM xcpretty-travis-formatter (>= 0.0.3, < 2.0.0) fastlane-plugin-sentry (1.19.0) os (~> 1.1, >= 1.1.4) - fastlane-plugin-wpmreleasetoolkit (11.0.1) + fastlane-plugin-wpmreleasetoolkit (11.0.2) activesupport (>= 6.1.7.1) buildkit (~> 1.5) chroma (= 0.2.0) @@ -219,7 +219,7 @@ 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.5) @@ -234,9 +234,9 @@ GEM 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.6) + mini_portile2 (2.8.7) minitest (5.23.1) multi_json (1.15.0) multipart-post (2.4.1) @@ -246,7 +246,7 @@ GEM naturally (2.2.1) nkf (0.2.0) no_proxy_fix (0.1.2) - nokogiri (1.16.5) + nokogiri (1.16.6) mini_portile2 (~> 2.8.2) racc (~> 1.4) octokit (6.1.1) @@ -256,7 +256,7 @@ GEM options (2.3.2) 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 @@ -277,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) From d20a7bfd494fc14d16eef7e7048e5ba98b2d2905 Mon Sep 17 00:00:00 2001 From: Ian Maia Date: Fri, 14 Jun 2024 12:11:55 +0200 Subject: [PATCH 3/4] Adjust to release-toolkit new action names --- fastlane/lanes/release.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fastlane/lanes/release.rb b/fastlane/lanes/release.rb index 78b704103e38..ff178e9484e3 100644 --- a/fastlane/lanes/release.rb +++ b/fastlane/lanes/release.rb @@ -76,8 +76,8 @@ push_to_git_remote(tags: false) - setbranchprotection(repository: GHHELPER_REPO, branch: "release/#{new_version}") - setfrozentag(repository: GHHELPER_REPO, milestone: new_version) + set_branch_protection(repository: GHHELPER_REPO, branch: "release/#{new_version}") + set_milestone_frozen_marker(repository: GHHELPER_REPO, milestone: new_version) end ##################################################################################### @@ -293,7 +293,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 @@ -315,7 +315,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) From a378a5ec01ffe91878bc75402005b0a1a1c10e4b Mon Sep 17 00:00:00 2001 From: Ian Maia Date: Mon, 17 Jun 2024 17:01:47 +0200 Subject: [PATCH 4/4] Use `copy_branch_protection` instead of `set_branch_protection` --- fastlane/lanes/release.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/fastlane/lanes/release.rb b/fastlane/lanes/release.rb index ff178e9484e3..d8491ed76b88 100644 --- a/fastlane/lanes/release.rb +++ b/fastlane/lanes/release.rb @@ -76,7 +76,11 @@ push_to_git_remote(tags: false) - set_branch_protection(repository: GHHELPER_REPO, branch: "release/#{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