Skip to content

Commit 1e24d45

Browse files
authored
chore(build): increase xcodebuild timeout for failing fastlane step in canary build (#4047)
* chore(build): increase fastlane timeout for failing canary * update code * update code * update canaries project * update amplify dependency * revert gems to older version for dependency review failure * revert gem with incompatible license * update code * update code * update code
1 parent ac7eeae commit 1e24d45

File tree

3 files changed

+66
-57
lines changed

3 files changed

+66
-57
lines changed

.github/workflows/canary.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,5 +59,7 @@ jobs:
5959

6060
- name: Run Tests - ${{ matrix.device }} with iOS ${{ matrix.version }}
6161
working-directory: ${{ github.workspace }}/canaries/example
62-
run: bundle exec fastlane scan --device "${{ matrix.device }}" --deployment_target_version "${{ matrix.version }}"
62+
run: |
63+
export FASTLANE_XCODEBUILD_SETTINGS_TIMEOUT=120
64+
bundle exec fastlane scan --device "${{ matrix.device }}" --deployment_target_version "${{ matrix.version }}"
6365

canaries/example/Gemfile.lock

Lines changed: 60 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@ GEM
22
remote: https://rubygems.org/
33
specs:
44
CFPropertyList (3.0.5)
5+
base64
6+
nkf
57
rexml
68
addressable (2.8.7)
79
public_suffix (>= 2.0.2, < 7.0)
8-
artifactory (3.0.15)
10+
artifactory (3.0.17)
911
atomos (0.1.3)
1012
aws-eventstream (1.2.0)
1113
aws-partitions (1.575.0)
@@ -25,6 +27,7 @@ GEM
2527
aws-eventstream (~> 1, >= 1.0.2)
2628
babosa (1.0.4)
2729
base64 (0.2.0)
30+
bigdecimal (3.2.2)
2831
claide (1.1.0)
2932
colored (1.2)
3033
colored2 (3.1.2)
@@ -33,11 +36,10 @@ GEM
3336
declarative (0.0.20)
3437
digest-crc (0.6.4)
3538
rake (>= 12.0.0, < 14.0.0)
36-
domain_name (0.5.20190701)
37-
unf (>= 0.0.5, < 1.0.0)
38-
dotenv (2.7.6)
39+
domain_name (0.6.20240107)
40+
dotenv (2.8.1)
3941
emoji_regex (3.2.3)
40-
excon (0.92.2)
42+
excon (0.112.0)
4143
faraday (1.10.4)
4244
faraday-em_http (~> 1.0)
4345
faraday-em_synchrony (~> 1.0)
@@ -54,27 +56,27 @@ GEM
5456
faraday (>= 0.8.0)
5557
http-cookie (~> 1.0.0)
5658
faraday-em_http (1.0.0)
57-
faraday-em_synchrony (1.0.0)
59+
faraday-em_synchrony (1.0.1)
5860
faraday-excon (1.1.0)
5961
faraday-httpclient (1.0.1)
60-
faraday-multipart (1.0.4)
61-
multipart-post (~> 2)
62+
faraday-multipart (1.1.1)
63+
multipart-post (~> 2.0)
6264
faraday-net_http (1.0.2)
6365
faraday-net_http_persistent (1.2.0)
6466
faraday-patron (1.0.0)
6567
faraday-rack (1.0.0)
6668
faraday-retry (1.0.3)
67-
faraday_middleware (1.2.0)
69+
faraday_middleware (1.2.1)
6870
faraday (~> 1.0)
69-
fastimage (2.2.6)
70-
fastlane (2.214.0)
71+
fastimage (2.4.0)
72+
fastlane (2.228.0)
7173
CFPropertyList (>= 2.3, < 4.0.0)
7274
addressable (>= 2.8, < 3.0.0)
7375
artifactory (~> 3.0)
7476
aws-sdk-s3 (~> 1.0)
7577
babosa (>= 1.0.3, < 2.0.0)
7678
bundler (>= 1.12.0, < 3.0.0)
77-
colored
79+
colored (~> 1.2)
7880
commander (~> 4.6)
7981
dotenv (>= 2.1.1, < 3.0.0)
8082
emoji_regex (>= 0.1, < 4.0)
@@ -83,32 +85,37 @@ GEM
8385
faraday-cookie_jar (~> 0.0.6)
8486
faraday_middleware (~> 1.0)
8587
fastimage (>= 2.1.0, < 3.0.0)
88+
fastlane-sirp (>= 1.0.0)
8689
gh_inspector (>= 1.1.2, < 2.0.0)
8790
google-apis-androidpublisher_v3 (~> 0.3)
8891
google-apis-playcustomapp_v1 (~> 0.1)
92+
google-cloud-env (>= 1.6.0, < 2.0.0)
8993
google-cloud-storage (~> 1.31)
9094
highline (~> 2.0)
95+
http-cookie (~> 1.0.5)
9196
json (< 3.0.0)
9297
jwt (>= 2.1.0, < 3)
9398
mini_magick (>= 4.9.4, < 5.0.0)
9499
multipart-post (>= 2.0.0, < 3.0.0)
95100
naturally (~> 2.2)
96-
optparse (~> 0.1.1)
101+
optparse (>= 0.1.1, < 1.0.0)
97102
plist (>= 3.1.0, < 4.0.0)
98103
rubyzip (>= 2.0.0, < 3.0.0)
99-
security (= 0.1.3)
104+
security (= 0.1.5)
100105
simctl (~> 1.6.3)
101106
terminal-notifier (>= 2.0.0, < 3.0.0)
102-
terminal-table (>= 1.4.5, < 2.0.0)
107+
terminal-table (~> 3)
103108
tty-screen (>= 0.6.3, < 1.0.0)
104109
tty-spinner (>= 0.8.0, < 1.0.0)
105110
word_wrap (~> 1.0.0)
106111
xcodeproj (>= 1.13.0, < 2.0.0)
107-
xcpretty (~> 0.3.0)
108-
xcpretty-travis-formatter (>= 0.0.3)
112+
xcpretty (~> 0.4.1)
113+
xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
114+
fastlane-sirp (1.0.0)
115+
sysrandom (~> 1.0)
109116
gh_inspector (1.1.3)
110-
google-apis-androidpublisher_v3 (0.18.0)
111-
google-apis-core (>= 0.4, < 2.a)
117+
google-apis-androidpublisher_v3 (0.54.0)
118+
google-apis-core (>= 0.11.0, < 2.a)
112119
google-apis-core (0.11.3)
113120
addressable (~> 2.5, >= 2.5.1)
114121
googleauth (>= 0.16.2, < 2.a)
@@ -117,23 +124,23 @@ GEM
117124
representable (~> 3.0)
118125
retriable (>= 2.0, < 4.a)
119126
rexml
120-
google-apis-iamcredentials_v1 (0.10.0)
121-
google-apis-core (>= 0.4, < 2.a)
122-
google-apis-playcustomapp_v1 (0.7.0)
123-
google-apis-core (>= 0.4, < 2.a)
124-
google-apis-storage_v1 (0.13.0)
125-
google-apis-core (>= 0.4, < 2.a)
126-
google-cloud-core (1.6.0)
127-
google-cloud-env (~> 1.0)
127+
google-apis-iamcredentials_v1 (0.17.0)
128+
google-apis-core (>= 0.11.0, < 2.a)
129+
google-apis-playcustomapp_v1 (0.13.0)
130+
google-apis-core (>= 0.11.0, < 2.a)
131+
google-apis-storage_v1 (0.31.0)
132+
google-apis-core (>= 0.11.0, < 2.a)
133+
google-cloud-core (1.8.0)
134+
google-cloud-env (>= 1.0, < 3.a)
128135
google-cloud-errors (~> 1.0)
129136
google-cloud-env (1.6.0)
130137
faraday (>= 0.17.3, < 3.0)
131-
google-cloud-errors (1.2.0)
132-
google-cloud-storage (1.36.1)
138+
google-cloud-errors (1.5.0)
139+
google-cloud-storage (1.47.0)
133140
addressable (~> 2.8)
134141
digest-crc (~> 0.4)
135142
google-apis-iamcredentials_v1 (~> 0.1)
136-
google-apis-storage_v1 (~> 0.1)
143+
google-apis-storage_v1 (~> 0.31.0)
137144
google-cloud-core (~> 1.6)
138145
googleauth (>= 0.16.2, < 2.a)
139146
mini_mime (~> 1.0)
@@ -144,71 +151,71 @@ GEM
144151
os (>= 0.9, < 2.0)
145152
signet (>= 0.16, < 2.a)
146153
highline (2.0.3)
147-
http-cookie (1.0.4)
154+
http-cookie (1.0.8)
148155
domain_name (~> 0.5)
149156
httpclient (2.8.3)
150-
jmespath (1.6.1)
157+
jmespath (1.6.2)
151158
json (2.6.1)
152-
jwt (2.9.1)
159+
jwt (2.10.2)
153160
base64
154-
mini_magick (4.11.0)
161+
mini_magick (4.13.2)
155162
mini_mime (1.1.5)
156163
multi_json (1.15.0)
157164
multipart-post (2.4.1)
158165
nanaimo (0.3.0)
159-
naturally (2.2.1)
160-
optparse (0.1.1)
166+
naturally (2.3.0)
167+
nkf (0.2.0)
168+
optparse (0.6.0)
161169
os (1.1.4)
162-
plist (3.6.0)
163-
public_suffix (6.0.1)
170+
plist (3.7.2)
171+
public_suffix (6.0.2)
164172
rake (13.0.6)
165173
representable (3.2.0)
166174
declarative (< 0.1.0)
167175
trailblazer-option (>= 0.1.1, < 0.2.0)
168176
uber (< 0.2.0)
169177
retriable (3.1.2)
170178
rexml (3.3.9)
171-
rouge (2.0.7)
179+
rouge (3.28.0)
172180
ruby2_keywords (0.0.5)
173-
rubyzip (2.3.2)
174-
security (0.1.3)
175-
signet (0.19.0)
181+
rubyzip (2.4.1)
182+
security (0.1.5)
183+
signet (0.21.0)
176184
addressable (~> 2.8)
177185
faraday (>= 0.17.5, < 3.a)
178-
jwt (>= 1.5, < 3.0)
186+
jwt (>= 1.5, < 4.0)
179187
multi_json (~> 1.10)
180-
simctl (1.6.8)
188+
simctl (1.6.10)
181189
CFPropertyList
182190
naturally
191+
sysrandom (1.0.5)
183192
terminal-notifier (2.0.0)
184-
terminal-table (1.8.0)
185-
unicode-display_width (~> 1.1, >= 1.1.1)
193+
terminal-table (3.0.2)
194+
unicode-display_width (>= 1.1.1, < 3)
186195
trailblazer-option (0.1.2)
187196
tty-cursor (0.7.1)
188-
tty-screen (0.8.1)
197+
tty-screen (0.8.2)
189198
tty-spinner (0.9.3)
190199
tty-cursor (~> 0.7)
191200
uber (0.1.0)
192-
unf (0.1.4)
193-
unf_ext
194-
unf_ext (0.0.8.1)
195-
unicode-display_width (1.8.0)
201+
unicode-display_width (2.6.0)
196202
word_wrap (1.0.0)
197203
xcodeproj (1.19.0)
198204
CFPropertyList (>= 2.3.3, < 4.0)
199205
atomos (~> 0.1.3)
200206
claide (>= 1.0.2, < 2.0)
201207
colored2 (~> 3.1)
202208
nanaimo (~> 0.3.0)
203-
xcpretty (0.3.0)
204-
rouge (~> 2.0.7)
209+
xcpretty (0.4.1)
210+
rouge (~> 3.28.0)
205211
xcpretty-travis-formatter (1.0.1)
206212
xcpretty (~> 0.2, >= 0.0.7)
207213

208214
PLATFORMS
209215
arm64-darwin-21
210216
arm64-darwin-22
211217
arm64-darwin-23
218+
arm64-darwin-24
212219
universal-darwin-20
213220
x86_64-darwin-19
214221
x86_64-darwin-21

canaries/example/MyAmplifyApp.xcodeproj/project.pbxproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 52;
6+
objectVersion = 54;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -497,8 +497,8 @@
497497
isa = XCRemoteSwiftPackageReference;
498498
repositoryURL = "https://github.com/aws-amplify/amplify-swift";
499499
requirement = {
500-
kind = upToNextMajorVersion;
501-
minimumVersion = 2.0.0;
500+
branch = main;
501+
kind = branch;
502502
};
503503
};
504504
/* End XCRemoteSwiftPackageReference section */

0 commit comments

Comments
 (0)