Skip to content

Commit 3f30c51

Browse files
authored
Merge pull request #20922 from wordpress-mobile/renovate/fastlane-plugin-wpmreleasetoolkit-11.x
Update dependency fastlane-plugin-wpmreleasetoolkit to v11
2 parents 139ac49 + a378a5e commit 3f30c51

3 files changed

Lines changed: 47 additions & 45 deletions

File tree

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ gem 'nokogiri'
99
### Fastlane Plugins
1010

1111
gem 'fastlane-plugin-sentry'
12-
gem 'fastlane-plugin-wpmreleasetoolkit', '~> 9.2'
12+
gem 'fastlane-plugin-wpmreleasetoolkit', '~> 11.0'
1313
# gem 'fastlane-plugin-wpmreleasetoolkit', path: '../../release-toolkit'
1414
# gem 'fastlane-plugin-wpmreleasetoolkit', git: 'https://github.com/wordpress-mobile/release-toolkit', branch: ''
1515

Gemfile.lock

Lines changed: 38 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ GEM
55
base64
66
nkf
77
rexml
8-
activesupport (7.1.3)
8+
activesupport (7.1.3.4)
99
base64
1010
bigdecimal
1111
concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -17,30 +17,29 @@ GEM
1717
tzinfo (~> 2.0)
1818
addressable (2.8.6)
1919
public_suffix (>= 2.0.2, < 6.0)
20-
artifactory (3.0.15)
20+
artifactory (3.0.17)
2121
ast (2.4.2)
2222
atomos (0.1.3)
2323
aws-eventstream (1.3.0)
24-
aws-partitions (1.894.0)
25-
aws-sdk-core (3.191.2)
24+
aws-partitions (1.944.0)
25+
aws-sdk-core (3.197.0)
2626
aws-eventstream (~> 1, >= 1.3.0)
2727
aws-partitions (~> 1, >= 1.651.0)
2828
aws-sigv4 (~> 1.8)
29-
base64
3029
jmespath (~> 1, >= 1.6.1)
31-
aws-sdk-kms (1.77.0)
32-
aws-sdk-core (~> 3, >= 3.191.0)
30+
aws-sdk-kms (1.84.0)
31+
aws-sdk-core (~> 3, >= 3.197.0)
3332
aws-sigv4 (~> 1.1)
34-
aws-sdk-s3 (1.143.0)
35-
aws-sdk-core (~> 3, >= 3.191.0)
33+
aws-sdk-s3 (1.152.3)
34+
aws-sdk-core (~> 3, >= 3.197.0)
3635
aws-sdk-kms (~> 1)
3736
aws-sigv4 (~> 1.8)
3837
aws-sigv4 (1.8.0)
3938
aws-eventstream (~> 1, >= 1.0.2)
4039
babosa (1.0.4)
4140
base64 (0.2.0)
42-
bigdecimal (3.1.6)
43-
buildkit (1.5.0)
41+
bigdecimal (3.1.8)
42+
buildkit (1.6.0)
4443
sawyer (>= 0.6)
4544
chroma (0.2.0)
4645
claide (1.1.0)
@@ -52,7 +51,7 @@ GEM
5251
colored2 (3.1.2)
5352
commander (4.6.0)
5453
highline (~> 2.0.0)
55-
concurrent-ruby (1.2.3)
54+
concurrent-ruby (1.3.3)
5655
connection_pool (2.4.1)
5756
cork (0.3.0)
5857
colored2 (~> 3.1)
@@ -85,10 +84,9 @@ GEM
8584
rake (>= 12.0.0, < 14.0.0)
8685
domain_name (0.6.20240107)
8786
dotenv (2.8.1)
88-
drb (2.2.0)
89-
ruby2_keywords
87+
drb (2.2.1)
9088
emoji_regex (3.2.3)
91-
excon (0.109.0)
89+
excon (0.110.0)
9290
faraday (1.10.3)
9391
faraday-em_http (~> 1.0)
9492
faraday-em_synchrony (~> 1.0)
@@ -119,15 +117,15 @@ GEM
119117
faraday-retry (1.0.3)
120118
faraday_middleware (1.2.0)
121119
faraday (~> 1.0)
122-
fastimage (2.3.0)
123-
fastlane (2.219.0)
120+
fastimage (2.3.1)
121+
fastlane (2.220.0)
124122
CFPropertyList (>= 2.3, < 4.0.0)
125123
addressable (>= 2.8, < 3.0.0)
126124
artifactory (~> 3.0)
127125
aws-sdk-s3 (~> 1.0)
128126
babosa (>= 1.0.3, < 2.0.0)
129127
bundler (>= 1.12.0, < 3.0.0)
130-
colored
128+
colored (~> 1.2)
131129
commander (~> 4.6)
132130
dotenv (>= 2.1.1, < 3.0.0)
133131
emoji_regex (>= 0.1, < 4.0)
@@ -148,10 +146,10 @@ GEM
148146
mini_magick (>= 4.9.4, < 5.0.0)
149147
multipart-post (>= 2.0.0, < 3.0.0)
150148
naturally (~> 2.2)
151-
optparse (>= 0.1.1)
149+
optparse (>= 0.1.1, < 1.0.0)
152150
plist (>= 3.1.0, < 4.0.0)
153151
rubyzip (>= 2.0.0, < 3.0.0)
154-
security (= 0.1.3)
152+
security (= 0.1.5)
155153
simctl (~> 1.6.3)
156154
terminal-notifier (>= 2.0.0, < 3.0.0)
157155
terminal-table (~> 3)
@@ -160,10 +158,10 @@ GEM
160158
word_wrap (~> 1.0.0)
161159
xcodeproj (>= 1.13.0, < 2.0.0)
162160
xcpretty (~> 0.3.0)
163-
xcpretty-travis-formatter (>= 0.0.3)
161+
xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
164162
fastlane-plugin-sentry (1.19.0)
165163
os (~> 1.1, >= 1.1.4)
166-
fastlane-plugin-wpmreleasetoolkit (9.4.0)
164+
fastlane-plugin-wpmreleasetoolkit (11.0.2)
167165
activesupport (>= 6.1.7.1)
168166
buildkit (~> 1.5)
169167
chroma (= 0.2.0)
@@ -172,7 +170,7 @@ GEM
172170
git (~> 1.3)
173171
google-cloud-storage (~> 1.31)
174172
java-properties (~> 0.3.0)
175-
nokogiri (~> 1.11, < 1.16)
173+
nokogiri (~> 1.11, < 1.17)
176174
octokit (~> 6.1)
177175
parallel (~> 1.14)
178176
plist (~> 3.1)
@@ -200,12 +198,12 @@ GEM
200198
google-apis-core (>= 0.11.0, < 2.a)
201199
google-apis-storage_v1 (0.31.0)
202200
google-apis-core (>= 0.11.0, < 2.a)
203-
google-cloud-core (1.6.1)
201+
google-cloud-core (1.7.0)
204202
google-cloud-env (>= 1.0, < 3.a)
205203
google-cloud-errors (~> 1.0)
206204
google-cloud-env (1.6.0)
207205
faraday (>= 0.17.3, < 3.0)
208-
google-cloud-errors (1.3.1)
206+
google-cloud-errors (1.4.0)
209207
google-cloud-storage (1.47.0)
210208
addressable (~> 2.8)
211209
digest-crc (~> 0.4)
@@ -221,25 +219,25 @@ GEM
221219
os (>= 0.9, < 2.0)
222220
signet (>= 0.16, < 2.a)
223221
highline (2.0.3)
224-
http-cookie (1.0.5)
222+
http-cookie (1.0.6)
225223
domain_name (~> 0.5)
226224
httpclient (2.8.3)
227-
i18n (1.14.1)
225+
i18n (1.14.5)
228226
concurrent-ruby (~> 1.0)
229227
java-properties (0.3.0)
230228
jmespath (1.6.2)
231229
json (2.7.2)
232-
jwt (2.8.0)
230+
jwt (2.8.1)
233231
base64
234232
kramdown (2.4.0)
235233
rexml
236234
kramdown-parser-gfm (1.1.0)
237235
kramdown (~> 2.0)
238236
language_server-protocol (3.17.0.3)
239-
mini_magick (4.12.0)
237+
mini_magick (4.13.0)
240238
mini_mime (1.1.5)
241-
mini_portile2 (2.8.5)
242-
minitest (5.22.2)
239+
mini_portile2 (2.8.7)
240+
minitest (5.23.1)
243241
multi_json (1.15.0)
244242
multipart-post (2.4.1)
245243
mutex_m (0.2.0)
@@ -248,23 +246,23 @@ GEM
248246
naturally (2.2.1)
249247
nkf (0.2.0)
250248
no_proxy_fix (0.1.2)
251-
nokogiri (1.15.5)
249+
nokogiri (1.16.6)
252250
mini_portile2 (~> 2.8.2)
253251
racc (~> 1.4)
254252
octokit (6.1.1)
255253
faraday (>= 1, < 3)
256254
sawyer (~> 0.9)
257255
open4 (1.3.4)
258256
options (2.3.2)
259-
optparse (0.4.0)
257+
optparse (0.5.0)
260258
os (1.1.4)
261-
parallel (1.24.0)
259+
parallel (1.25.1)
262260
parser (3.3.2.0)
263261
ast (~> 2.4.1)
264262
racc
265263
plist (3.7.1)
266-
progress_bar (1.3.3)
267-
highline (>= 1.6, < 3)
264+
progress_bar (1.3.4)
265+
highline (>= 1.6)
268266
options (~> 2.3.0)
269267
public_suffix (5.0.5)
270268
racc (1.8.0)
@@ -279,8 +277,8 @@ GEM
279277
trailblazer-option (>= 0.1.1, < 0.2.0)
280278
uber (< 0.2.0)
281279
retriable (3.1.2)
282-
rexml (3.2.8)
283-
strscan (>= 3.0.9)
280+
rexml (3.2.9)
281+
strscan
284282
rmagick (4.3.0)
285283
rouge (2.0.7)
286284
rubocop (1.64.1)
@@ -302,7 +300,7 @@ GEM
302300
sawyer (0.9.2)
303301
addressable (>= 2.3.5)
304302
faraday (>= 0.17.3, < 3)
305-
security (0.1.3)
303+
security (0.1.5)
306304
signet (0.19.0)
307305
addressable (~> 2.8)
308306
faraday (>= 0.17.5, < 3.a)
@@ -344,7 +342,7 @@ DEPENDENCIES
344342
danger-dangermattic (~> 1.0)
345343
fastlane (~> 2)
346344
fastlane-plugin-sentry
347-
fastlane-plugin-wpmreleasetoolkit (~> 9.2)
345+
fastlane-plugin-wpmreleasetoolkit (~> 11.0)
348346
nokogiri
349347
rmagick (~> 4.1)
350348

fastlane/lanes/release.rb

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,12 @@
7676

7777
push_to_git_remote(tags: false)
7878

79-
setbranchprotection(repository: GHHELPER_REPO, branch: "release/#{new_version}")
80-
setfrozentag(repository: GHHELPER_REPO, milestone: new_version)
79+
copy_branch_protection(
80+
repository: GHHELPER_REPO,
81+
from_branch: DEFAULT_BRANCH,
82+
to_branch: "release/#{new_version}"
83+
)
84+
set_milestone_frozen_marker(repository: GHHELPER_REPO, milestone: new_version)
8185
end
8286

8387
#####################################################################################
@@ -293,7 +297,7 @@
293297
release_branch = "release/#{current_release_version}"
294298

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

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

317321
# Wrap up
318-
setfrozentag(repository: GHHELPER_REPO, milestone: version_name, freeze: false)
322+
set_milestone_frozen_marker(repository: GHHELPER_REPO, milestone: version_name, freeze: false)
319323
create_new_milestone(repository: GHHELPER_REPO)
320324
close_milestone(repository: GHHELPER_REPO, milestone: version_name)
321325

0 commit comments

Comments
 (0)