Skip to content

Commit 2bffa51

Browse files
Add workaround to distribute prototype build in synchronized folder Xcode setup (#681)
2 parents d780338 + c796623 commit 2bffa51

File tree

2 files changed

+49
-27
lines changed

2 files changed

+49
-27
lines changed

Gemfile.lock

Lines changed: 30 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -24,21 +24,23 @@ GEM
2424
artifactory (3.0.17)
2525
ast (2.4.2)
2626
atomos (0.1.3)
27-
aws-eventstream (1.3.0)
28-
aws-partitions (1.995.0)
29-
aws-sdk-core (3.211.0)
27+
aws-eventstream (1.3.2)
28+
aws-partitions (1.1075.0)
29+
aws-sdk-core (3.221.0)
3030
aws-eventstream (~> 1, >= 1.3.0)
3131
aws-partitions (~> 1, >= 1.992.0)
3232
aws-sigv4 (~> 1.9)
33+
base64
3334
jmespath (~> 1, >= 1.6.1)
34-
aws-sdk-kms (1.95.0)
35-
aws-sdk-core (~> 3, >= 3.210.0)
35+
logger
36+
aws-sdk-kms (1.99.0)
37+
aws-sdk-core (~> 3, >= 3.216.0)
3638
aws-sigv4 (~> 1.5)
37-
aws-sdk-s3 (1.169.0)
38-
aws-sdk-core (~> 3, >= 3.210.0)
39+
aws-sdk-s3 (1.182.0)
40+
aws-sdk-core (~> 3, >= 3.216.0)
3941
aws-sdk-kms (~> 1)
4042
aws-sigv4 (~> 1.5)
41-
aws-sigv4 (1.10.1)
43+
aws-sigv4 (1.11.0)
4244
aws-eventstream (~> 1, >= 1.0.2)
4345
babosa (1.0.4)
4446
base64 (0.2.0)
@@ -122,7 +124,7 @@ GEM
122124
rubocop (~> 1.0)
123125
declarative (0.0.20)
124126
diffy (3.4.3)
125-
digest-crc (0.6.5)
127+
digest-crc (0.7.0)
126128
rake (>= 12.0.0, < 14.0.0)
127129
domain_name (0.6.20240107)
128130
dotenv (2.8.1)
@@ -153,17 +155,17 @@ GEM
153155
faraday-http-cache (2.5.1)
154156
faraday (>= 0.8)
155157
faraday-httpclient (1.0.1)
156-
faraday-multipart (1.0.4)
157-
multipart-post (~> 2)
158+
faraday-multipart (1.1.0)
159+
multipart-post (~> 2.0)
158160
faraday-net_http (1.0.2)
159161
faraday-net_http_persistent (1.2.0)
160162
faraday-patron (1.0.0)
161163
faraday-rack (1.0.0)
162164
faraday-retry (1.0.3)
163165
faraday_middleware (1.2.1)
164166
faraday (~> 1.0)
165-
fastimage (2.3.1)
166-
fastlane (2.225.0)
167+
fastimage (2.4.0)
168+
fastlane (2.227.0)
167169
CFPropertyList (>= 2.3, < 4.0.0)
168170
addressable (>= 2.8, < 3.0.0)
169171
artifactory (~> 3.0)
@@ -203,7 +205,7 @@ GEM
203205
tty-spinner (>= 0.8.0, < 1.0.0)
204206
word_wrap (~> 1.0.0)
205207
xcodeproj (>= 1.13.0, < 2.0.0)
206-
xcpretty (~> 0.3.0)
208+
xcpretty (~> 0.4.0)
207209
xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
208210
fastlane-plugin-appcenter (2.1.2)
209211
fastlane-plugin-wpmreleasetoolkit (12.2.1)
@@ -249,12 +251,12 @@ GEM
249251
google-apis-core (>= 0.11.0, < 2.a)
250252
google-apis-storage_v1 (0.31.0)
251253
google-apis-core (>= 0.11.0, < 2.a)
252-
google-cloud-core (1.7.1)
254+
google-cloud-core (1.8.0)
253255
google-cloud-env (>= 1.0, < 3.a)
254256
google-cloud-errors (~> 1.0)
255257
google-cloud-env (1.6.0)
256258
faraday (>= 0.17.3, < 3.0)
257-
google-cloud-errors (1.4.0)
259+
google-cloud-errors (1.5.0)
258260
google-cloud-storage (1.47.0)
259261
addressable (~> 2.8)
260262
digest-crc (~> 0.4)
@@ -270,15 +272,16 @@ GEM
270272
os (>= 0.9, < 2.0)
271273
signet (>= 0.16, < 2.a)
272274
highline (2.0.3)
273-
http-cookie (1.0.7)
275+
http-cookie (1.0.8)
274276
domain_name (~> 0.5)
275-
httpclient (2.8.3)
277+
httpclient (2.9.0)
278+
mutex_m
276279
i18n (1.14.6)
277280
concurrent-ruby (~> 1.0)
278281
java-properties (0.3.0)
279282
jmespath (1.6.2)
280-
json (2.7.4)
281-
jwt (2.9.3)
283+
json (2.10.2)
284+
jwt (2.10.1)
282285
base64
283286
kramdown (2.5.1)
284287
rexml (>= 3.3.9)
@@ -293,6 +296,7 @@ GEM
293296
molinillo (0.8.0)
294297
multi_json (1.15.0)
295298
multipart-post (2.4.1)
299+
mutex_m (0.3.0)
296300
nanaimo (0.4.0)
297301
nap (1.1.0)
298302
naturally (2.2.1)
@@ -308,13 +312,13 @@ GEM
308312
sawyer (~> 0.9)
309313
open4 (1.3.4)
310314
options (2.3.2)
311-
optparse (0.5.0)
315+
optparse (0.6.0)
312316
os (1.1.4)
313317
parallel (1.26.3)
314318
parser (3.3.5.0)
315319
ast (~> 2.4.1)
316320
racc
317-
plist (3.7.1)
321+
plist (3.7.2)
318322
progress_bar (1.3.4)
319323
highline (>= 1.6)
320324
options (~> 2.3.0)
@@ -333,7 +337,7 @@ GEM
333337
uber (< 0.2.0)
334338
retriable (3.1.2)
335339
rexml (3.4.1)
336-
rouge (2.0.7)
340+
rouge (3.28.0)
337341
rubocop (1.67.0)
338342
json (~> 2.3)
339343
language_server-protocol (>= 3.17.0)
@@ -349,7 +353,7 @@ GEM
349353
ruby-macho (2.5.1)
350354
ruby-progressbar (1.13.0)
351355
ruby2_keywords (0.0.5)
352-
rubyzip (2.3.2)
356+
rubyzip (2.4.1)
353357
sawyer (0.9.2)
354358
addressable (>= 2.3.5)
355359
faraday (>= 0.17.3, < 3)
@@ -386,8 +390,8 @@ GEM
386390
colored2 (~> 3.1)
387391
nanaimo (~> 0.4.0)
388392
rexml (>= 3.3.6, < 4.0)
389-
xcpretty (0.3.0)
390-
rouge (~> 2.0.7)
393+
xcpretty (0.4.1)
394+
rouge (~> 3.28.0)
391395
xcpretty-travis-formatter (1.0.1)
392396
xcpretty (~> 0.2, >= 0.0.7)
393397

fastlane/Fastfile

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ platform :ios do
6363
end
6464

6565
desc 'Builds the Gravatar-Demo project with a specific scheme'
66-
lane :build_demo do |scheme: 'Gravatar-Demo'|
66+
lane :build_demo do |scheme: 'Gravatar Demo'|
6767
# We only need to build for testing to ensure that the project builds.
6868
# There are no tests in the the Demo apps
6969
run_tests(
@@ -89,6 +89,24 @@ platform :ios do
8989
scheme: scheme,
9090
configuration: 'Release',
9191
export_method: 'enterprise',
92+
# Somehow, switching to Xcode synchronized folders broke Fastlane's ability to generate the export_options automatically.
93+
# As such, we specify them manually for the time being.
94+
#
95+
# See:
96+
# - https://github.com/Automattic/Gravatar-SDK-iOS/pull/676
97+
# - https://buildkite.com/automattic/gravatar-sdk-ios/builds/2135/steps?sid=0195d364-32bb-47c4-a10c-0da0a39806ce
98+
# - https://github.com/fastlane/fastlane/issues/29256
99+
# - https://github.com/CocoaPods/Xcodeproj/pull/985
100+
export_options: {
101+
provisioningProfiles: {
102+
"#{bundle_id_prototype_build!}": read_from_xcconfig!(
103+
key: 'PROVISIONING_PROFILE_SPECIFIER',
104+
xcconfig: XCCONFIG_PROTOTYPE_BUILD
105+
)
106+
},
107+
method: 'enterprise',
108+
signingSytle: 'manual'
109+
},
92110
output_directory: ARTIFACTS_FOLDER,
93111
xcargs: [
94112
"CURRENT_PROJECT_VERSION=#{build_number}",

0 commit comments

Comments
 (0)