Skip to content

Commit eeed181

Browse files
authored
Add api_url parameter to create_release_backmerge_pull_request (#641)
2 parents cf9a44a + 6191b8d commit eeed181

File tree

7 files changed

+184
-121
lines changed

7 files changed

+184
-121
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,11 @@ _None_
1111
### New Features
1212

1313
- Make fastlane log actions as collapsible groups in Buildkite. [#638]
14+
- Add `api_url` parameter to `create_release_backmerge_pull_request` to support GitHub Enterprise. Also, updated the code so the intermediate branch tracks its remote branch after pushing. [#641]
1415

1516
### Bug Fixes
1617

18+
- Fix issue in `create_release_backmerge_pull_request` where calling another fastlane action from the `intermediate_branch_created_callback` proc now behaves correctly. [#641]
1719
- Fix an issue where `prototype_build_details_comment` added some unexpected metadata rows in the comment table if we didn't use `firebase_app_distribution` (e.g. for Prototype Builds uploaded to S3 and not using FAD) [#642]
1820

1921
### Internal Changes

Gemfile.lock

Lines changed: 73 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,9 @@ GEM
2626
base64
2727
nkf
2828
rexml
29-
activesupport (7.2.1.2)
29+
activesupport (7.2.2.1)
3030
base64
31+
benchmark (>= 0.3)
3132
bigdecimal
3233
concurrent-ruby (~> 1.0, >= 1.3.1)
3334
connection_pool (>= 2.2.5)
@@ -45,38 +46,40 @@ GEM
4546
artifactory (3.0.17)
4647
ast (2.4.2)
4748
atomos (0.1.3)
48-
aws-eventstream (1.3.0)
49-
aws-partitions (1.997.0)
50-
aws-sdk-core (3.211.0)
49+
aws-eventstream (1.3.2)
50+
aws-partitions (1.1068.0)
51+
aws-sdk-core (3.220.1)
5152
aws-eventstream (~> 1, >= 1.3.0)
5253
aws-partitions (~> 1, >= 1.992.0)
5354
aws-sigv4 (~> 1.9)
55+
base64
5456
jmespath (~> 1, >= 1.6.1)
55-
aws-sdk-kms (1.95.0)
56-
aws-sdk-core (~> 3, >= 3.210.0)
57+
aws-sdk-kms (1.99.0)
58+
aws-sdk-core (~> 3, >= 3.216.0)
5759
aws-sigv4 (~> 1.5)
58-
aws-sdk-s3 (1.169.0)
59-
aws-sdk-core (~> 3, >= 3.210.0)
60+
aws-sdk-s3 (1.182.0)
61+
aws-sdk-core (~> 3, >= 3.216.0)
6062
aws-sdk-kms (~> 1)
6163
aws-sigv4 (~> 1.5)
62-
aws-sigv4 (1.10.1)
64+
aws-sigv4 (1.11.0)
6365
aws-eventstream (~> 1, >= 1.0.2)
6466
babosa (1.0.4)
6567
base64 (0.2.0)
66-
bigdecimal (3.1.8)
68+
benchmark (0.4.0)
69+
bigdecimal (3.1.9)
6770
buildkit (1.6.1)
6871
sawyer (>= 0.6)
69-
buildkite-test_collector (2.7.0)
72+
buildkite-test_collector (2.9.0)
7073
chroma (0.2.0)
7174
claide (1.1.0)
7275
claide-plugins (0.9.2)
7376
cork
7477
nap
7578
open4 (~> 1.3)
76-
cocoapods (1.16.0)
79+
cocoapods (1.16.2)
7780
addressable (~> 2.8)
7881
claide (>= 1.0.2, < 2.0)
79-
cocoapods-core (= 1.16.0)
82+
cocoapods-core (= 1.16.2)
8083
cocoapods-deintegrate (>= 1.0.3, < 2.0)
8184
cocoapods-downloader (>= 2.1, < 3.0)
8285
cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -90,8 +93,8 @@ GEM
9093
molinillo (~> 0.8.0)
9194
nap (~> 1.0)
9295
ruby-macho (>= 2.3.0, < 3.0)
93-
xcodeproj (>= 1.26.0, < 2.0)
94-
cocoapods-core (1.16.0)
96+
xcodeproj (>= 1.27.0, < 2.0)
97+
cocoapods-core (1.16.2)
9598
activesupport (>= 5.0, < 8)
9699
addressable (~> 2.8)
97100
algoliasearch (~> 1.0)
@@ -117,8 +120,8 @@ GEM
117120
colored2 (3.1.2)
118121
commander (4.6.0)
119122
highline (~> 2.0.0)
120-
concurrent-ruby (1.3.4)
121-
connection_pool (2.4.1)
123+
concurrent-ruby (1.3.5)
124+
connection_pool (2.5.0)
122125
cork (0.3.0)
123126
colored2 (~> 3.1)
124127
crack (1.0.0)
@@ -138,7 +141,7 @@ GEM
138141
octokit (>= 4.0)
139142
pstore (~> 0.1)
140143
terminal-table (>= 1, < 4)
141-
danger-dangermattic (1.1.2)
144+
danger-dangermattic (1.2.2)
142145
danger (~> 9.4)
143146
danger-plugin-api (~> 1.0)
144147
danger-rubocop (~> 0.13)
@@ -149,9 +152,9 @@ GEM
149152
danger
150153
rubocop (~> 1.0)
151154
declarative (0.0.20)
152-
diff-lcs (1.5.1)
155+
diff-lcs (1.6.0)
153156
diffy (3.4.3)
154-
digest-crc (0.6.5)
157+
digest-crc (0.7.0)
155158
rake (>= 12.0.0, < 14.0.0)
156159
docile (1.4.1)
157160
domain_name (0.6.20240107)
@@ -183,17 +186,17 @@ GEM
183186
faraday-http-cache (2.5.1)
184187
faraday (>= 0.8)
185188
faraday-httpclient (1.0.1)
186-
faraday-multipart (1.0.4)
187-
multipart-post (~> 2)
189+
faraday-multipart (1.1.0)
190+
multipart-post (~> 2.0)
188191
faraday-net_http (1.0.2)
189192
faraday-net_http_persistent (1.2.0)
190193
faraday-patron (1.0.0)
191194
faraday-rack (1.0.0)
192195
faraday-retry (1.0.3)
193196
faraday_middleware (1.2.1)
194197
faraday (~> 1.0)
195-
fastimage (2.3.1)
196-
fastlane (2.225.0)
198+
fastimage (2.4.0)
199+
fastlane (2.227.0)
197200
CFPropertyList (>= 2.3, < 4.0.0)
198201
addressable (>= 2.8, < 3.0.0)
199202
artifactory (~> 3.0)
@@ -233,11 +236,11 @@ GEM
233236
tty-spinner (>= 0.8.0, < 1.0.0)
234237
word_wrap (~> 1.0.0)
235238
xcodeproj (>= 1.13.0, < 2.0.0)
236-
xcpretty (~> 0.3.0)
239+
xcpretty (~> 0.4.0)
237240
xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
238241
fastlane-sirp (1.0.0)
239242
sysrandom (~> 1.0)
240-
ffi (1.17.0)
243+
ffi (1.17.1)
241244
fourflusher (2.3.1)
242245
fuzzy_match (2.0.4)
243246
gh_inspector (1.1.3)
@@ -260,12 +263,12 @@ GEM
260263
google-apis-core (>= 0.11.0, < 2.a)
261264
google-apis-storage_v1 (0.31.0)
262265
google-apis-core (>= 0.11.0, < 2.a)
263-
google-cloud-core (1.7.1)
266+
google-cloud-core (1.8.0)
264267
google-cloud-env (>= 1.0, < 3.a)
265268
google-cloud-errors (~> 1.0)
266269
google-cloud-env (1.6.0)
267270
faraday (>= 0.17.3, < 3.0)
268-
google-cloud-errors (1.4.0)
271+
google-cloud-errors (1.5.0)
269272
google-cloud-storage (1.47.0)
270273
addressable (~> 2.8)
271274
digest-crc (~> 0.4)
@@ -280,38 +283,41 @@ GEM
280283
multi_json (~> 1.11)
281284
os (>= 0.9, < 2.0)
282285
signet (>= 0.16, < 2.a)
283-
hashdiff (1.1.1)
286+
hashdiff (1.1.2)
284287
highline (2.0.3)
285-
http-cookie (1.0.7)
288+
http-cookie (1.0.8)
286289
domain_name (~> 0.5)
287-
httpclient (2.8.3)
288-
i18n (1.14.6)
290+
httpclient (2.9.0)
291+
mutex_m
292+
i18n (1.14.7)
289293
concurrent-ruby (~> 1.0)
290294
java-properties (0.3.0)
291295
jmespath (1.6.2)
292-
json (2.7.4)
293-
jwt (2.9.3)
296+
json (2.10.2)
297+
jwt (2.10.1)
294298
base64
295-
kramdown (2.4.0)
296-
rexml
299+
kramdown (2.5.1)
300+
rexml (>= 3.3.9)
297301
kramdown-parser-gfm (1.1.0)
298302
kramdown (~> 2.0)
299-
language_server-protocol (3.17.0.3)
300-
logger (1.6.1)
303+
language_server-protocol (3.17.0.4)
304+
lint_roller (1.1.0)
305+
logger (1.6.6)
301306
method_source (0.9.2)
302307
mini_magick (4.13.2)
303308
mini_mime (1.1.5)
304-
mini_portile2 (2.8.7)
305-
minitest (5.25.1)
309+
mini_portile2 (2.8.8)
310+
minitest (5.25.5)
306311
molinillo (0.8.0)
307312
multi_json (1.15.0)
308313
multipart-post (2.4.1)
314+
mutex_m (0.3.0)
309315
nanaimo (0.4.0)
310316
nap (1.1.0)
311317
naturally (2.2.1)
312318
netrc (0.11.0)
313319
nkf (0.2.0)
314-
nokogiri (1.16.7)
320+
nokogiri (1.18.4)
315321
mini_portile2 (~> 2.8.2)
316322
racc (~> 1.4)
317323
observer (0.1.2)
@@ -320,76 +326,77 @@ GEM
320326
sawyer (~> 0.9)
321327
open4 (1.3.4)
322328
options (2.3.2)
323-
optparse (0.5.0)
329+
optparse (0.6.0)
324330
os (1.1.4)
325331
parallel (1.26.3)
326-
parser (3.3.5.0)
332+
parser (3.3.7.1)
327333
ast (~> 2.4.1)
328334
racc
329-
pkg-config (1.5.7)
330-
plist (3.7.1)
335+
pkg-config (1.6.0)
336+
plist (3.7.2)
331337
progress_bar (1.3.4)
332338
highline (>= 1.6)
333339
options (~> 2.3.0)
334340
pry (0.12.2)
335341
coderay (~> 1.1.0)
336342
method_source (~> 0.9.0)
337-
pstore (0.1.3)
343+
pstore (0.2.0)
338344
public_suffix (4.0.7)
339345
racc (1.8.1)
340346
rainbow (3.1.1)
341347
rake (13.2.1)
342-
rake-compiler (1.2.8)
348+
rake-compiler (1.2.9)
343349
rake
344-
rchardet (1.8.0)
345-
regexp_parser (2.9.2)
350+
rchardet (1.9.0)
351+
regexp_parser (2.10.0)
346352
representable (3.2.0)
347353
declarative (< 0.1.0)
348354
trailblazer-option (>= 0.1.1, < 0.2.0)
349355
uber (< 0.2.0)
350356
retriable (3.1.2)
351-
rexml (3.3.9)
357+
rexml (3.4.1)
352358
rmagick (5.5.0)
353359
observer (~> 0.1)
354360
pkg-config (~> 1.4)
355-
rouge (2.0.7)
361+
rouge (3.28.0)
356362
rspec (3.13.0)
357363
rspec-core (~> 3.13.0)
358364
rspec-expectations (~> 3.13.0)
359365
rspec-mocks (~> 3.13.0)
360-
rspec-core (3.13.2)
366+
rspec-core (3.13.3)
361367
rspec-support (~> 3.13.0)
362368
rspec-expectations (3.13.3)
363369
diff-lcs (>= 1.2.0, < 2.0)
364370
rspec-support (~> 3.13.0)
365371
rspec-mocks (3.13.2)
366372
diff-lcs (>= 1.2.0, < 2.0)
367373
rspec-support (~> 3.13.0)
368-
rspec-support (3.13.1)
374+
rspec-support (3.13.2)
369375
rspec_junit_formatter (0.4.1)
370376
rspec-core (>= 2, < 4, != 2.12.0)
371-
rubocop (1.67.0)
377+
rubocop (1.74.0)
372378
json (~> 2.3)
373-
language_server-protocol (>= 3.17.0)
379+
language_server-protocol (~> 3.17.0.2)
380+
lint_roller (~> 1.1.0)
374381
parallel (~> 1.10)
375382
parser (>= 3.3.0.2)
376383
rainbow (>= 2.2.2, < 4.0)
377-
regexp_parser (>= 2.4, < 3.0)
378-
rubocop-ast (>= 1.32.2, < 2.0)
384+
regexp_parser (>= 2.9.3, < 3.0)
385+
rubocop-ast (>= 1.38.0, < 2.0)
379386
ruby-progressbar (~> 1.7)
380-
unicode-display_width (>= 2.4.0, < 3.0)
381-
rubocop-ast (1.32.3)
387+
unicode-display_width (>= 2.4.0, < 4.0)
388+
rubocop-ast (1.39.0)
382389
parser (>= 3.3.1.0)
383390
rubocop-rspec (3.0.0)
384391
rubocop (~> 1.40)
385392
ruby-macho (2.5.1)
386393
ruby-progressbar (1.13.0)
387394
ruby2_keywords (0.0.5)
388-
rubyzip (2.3.2)
395+
rubyzip (2.4.1)
389396
sawyer (0.9.2)
390397
addressable (>= 2.3.5)
391398
faraday (>= 0.17.3, < 3)
392-
securerandom (0.3.1)
399+
securerandom (0.4.1)
393400
security (0.1.5)
394401
signet (0.19.0)
395402
addressable (~> 2.8)
@@ -419,20 +426,20 @@ GEM
419426
concurrent-ruby (~> 1.0)
420427
uber (0.1.0)
421428
unicode-display_width (2.6.0)
422-
webmock (3.24.0)
429+
webmock (3.25.1)
423430
addressable (>= 2.8.0)
424431
crack (>= 0.3.2)
425432
hashdiff (>= 0.4.0, < 2.0.0)
426433
word_wrap (1.0.0)
427-
xcodeproj (1.26.0)
434+
xcodeproj (1.27.0)
428435
CFPropertyList (>= 2.3.3, < 4.0)
429436
atomos (~> 0.1.3)
430437
claide (>= 1.0.2, < 2.0)
431438
colored2 (~> 3.1)
432439
nanaimo (~> 0.4.0)
433440
rexml (>= 3.3.6, < 4.0)
434-
xcpretty (0.3.0)
435-
rouge (~> 2.0.7)
441+
xcpretty (0.4.0)
442+
rouge (~> 3.28.0)
436443
xcpretty-travis-formatter (1.0.1)
437444
xcpretty (~> 0.2, >= 0.0.7)
438445
yard (0.9.37)
@@ -459,4 +466,4 @@ DEPENDENCIES
459466
yard
460467

461468
BUNDLED WITH
462-
2.4.20
469+
2.6.3

0 commit comments

Comments
 (0)