Skip to content
This repository was archived by the owner on Jan 4, 2023. It is now read-only.

Commit 33f9870

Browse files
author
Ash Furrow
authored
Merge pull request #719 from artsy/run-ci-tests
Updates CocoaPods, CocoaPods source, Xcode version, CI config
2 parents 67fd72c + d96f59b commit 33f9870

File tree

5 files changed

+66
-50
lines changed

5 files changed

+66
-50
lines changed

‎.circleci/config.yml‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
CardflightProductionMerchantAccountToken: "-"
2121
StripeProductionPublishableKey: "-"
2222
macos:
23-
xcode: 9.2.0
23+
xcode: 9.4.1
2424
shell: /bin/bash --login
2525

2626
steps:
@@ -29,11 +29,13 @@ jobs:
2929
- run: ruby -v
3030
- run: xcodebuild -version
3131

32+
- run: xcrun simctl list
33+
3234
# Try to restore installed Gems
3335
- restore_cache:
3436
keys:
35-
- v1-gems-{{ checksum "Gemfile.lock" }}
36-
- v1-gems-
37+
- v1-gems-{{ checksum "Gemfile.lock" }}
38+
- v1-gems-
3739
- run: bundle check || bundle install --path=vendor/bundle --jobs 4 --retry 3
3840
- save_cache:
3941
key: v1-gems-{{ checksum "Gemfile.lock" }}
@@ -43,10 +45,11 @@ jobs:
4345
# Try to restore CocoaPods dependencies
4446
- restore_cache:
4547
keys:
46-
- v2-pods-{{ checksum "Podfile.lock" }}
47-
- v2-pods-
48-
- run: bundle exec pod check || curl -sS https://cocoapods-specs.circleci.com/fetch-cocoapods-repo-from-s3.sh | bash -s cf
48+
- v2-pods-{{ checksum "Podfile.lock" }}
49+
- v2-pods-
50+
4951
- run: bundle exec pod check || bundle exec pod install --verbose
52+
5053
- save_cache:
5154
key: v2-pods-{{ checksum "Podfile.lock" }}
5255
paths:
@@ -55,16 +58,16 @@ jobs:
5558
# Restore the derived data cache (to speed up CI compile times), run the tests, and store the cache
5659
- restore_cache:
5760
keys:
58-
- v1-derived-{{ .Branch }}
59-
- v1-derived-
60-
- run:
61+
- v1-derived-{{ .Branch }}
62+
- v1-derived-
63+
- run:
6164
name: Run tests
62-
command: set -o pipefail && xcodebuild -destination "name=iPad Air 2,OS=11.2" -scheme "Kiosk" -workspace "Kiosk.xcworkspace" -derivedDataPath derived_data build | xcpretty --color
65+
command: set -o pipefail && xcodebuild -destination "name=iPad Air 2,OS=11.2" -scheme "Kiosk" -workspace "Kiosk.xcworkspace" -derivedDataPath derived_data build test | xcpretty --color
6366
- save_cache:
6467
key: v1-derived-{{ .Branch }}
6568
paths:
66-
- derived_data
67-
69+
- derived_data
70+
6871
# Teardown
6972
# Save the Xcode activity log
7073
- run: find $HOME/Library/Developer/Xcode/DerivedData -name '*.xcactivitylog' -exec cp {} $CIRCLE_ARTIFACTS/xcactivitylog \; || true

‎Gemfile.lock‎

Lines changed: 36 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,73 +1,82 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
CFPropertyList (3.0.0)
4+
CFPropertyList (3.0.2)
55
RubyInline (3.12.4)
66
ZenTest (~> 4.3)
77
ZenTest (4.12.0)
8-
activesupport (4.2.10)
8+
activesupport (4.2.11.1)
99
i18n (~> 0.7)
1010
minitest (~> 5.1)
1111
thread_safe (~> 0.3, >= 0.3.4)
1212
tzinfo (~> 1.1)
1313
addressable (2.5.2)
1414
public_suffix (>= 2.0.2, < 4.0)
15+
algoliasearch (1.27.1)
16+
httpclient (~> 2.8, >= 2.8.3)
17+
json (>= 1.5.1)
1518
atomos (0.1.3)
1619
aws-sdk-v1 (1.67.0)
1720
json (~> 1.4)
1821
nokogiri (~> 1)
1922
babosa (1.0.2)
20-
claide (1.0.2)
21-
cocoapods (1.5.3)
23+
claide (1.0.3)
24+
cocoapods (1.9.1)
2225
activesupport (>= 4.0.2, < 5)
2326
claide (>= 1.0.2, < 2.0)
24-
cocoapods-core (= 1.5.3)
25-
cocoapods-deintegrate (>= 1.0.2, < 2.0)
26-
cocoapods-downloader (>= 1.2.0, < 2.0)
27+
cocoapods-core (= 1.9.1)
28+
cocoapods-deintegrate (>= 1.0.3, < 2.0)
29+
cocoapods-downloader (>= 1.2.2, < 2.0)
2730
cocoapods-plugins (>= 1.0.0, < 2.0)
2831
cocoapods-search (>= 1.0.0, < 2.0)
2932
cocoapods-stats (>= 1.0.0, < 2.0)
30-
cocoapods-trunk (>= 1.3.0, < 2.0)
33+
cocoapods-trunk (>= 1.4.0, < 2.0)
3134
cocoapods-try (>= 1.1.0, < 2.0)
3235
colored2 (~> 3.1)
3336
escape (~> 0.0.4)
34-
fourflusher (~> 2.0.1)
37+
fourflusher (>= 2.3.0, < 3.0)
3538
gh_inspector (~> 1.0)
36-
molinillo (~> 0.6.5)
39+
molinillo (~> 0.6.6)
3740
nap (~> 1.0)
38-
ruby-macho (~> 1.1)
39-
xcodeproj (>= 1.5.7, < 2.0)
41+
ruby-macho (~> 1.4)
42+
xcodeproj (>= 1.14.0, < 2.0)
4043
cocoapods-check (1.0.2)
4144
cocoapods (~> 1.0)
42-
cocoapods-core (1.5.3)
45+
cocoapods-core (1.9.1)
4346
activesupport (>= 4.0.2, < 6)
47+
algoliasearch (~> 1.0)
48+
concurrent-ruby (~> 1.1)
4449
fuzzy_match (~> 2.0.4)
4550
nap (~> 1.0)
46-
cocoapods-deintegrate (1.0.2)
47-
cocoapods-downloader (1.2.2)
51+
netrc (~> 0.11)
52+
typhoeus (~> 1.0)
53+
cocoapods-deintegrate (1.0.4)
54+
cocoapods-downloader (1.3.0)
4855
cocoapods-keys (2.0.6)
4956
dotenv
5057
osx_keychain
5158
cocoapods-plugins (1.0.0)
5259
nap
5360
cocoapods-search (1.0.0)
54-
cocoapods-stats (1.0.0)
55-
cocoapods-trunk (1.3.1)
61+
cocoapods-stats (1.1.0)
62+
cocoapods-trunk (1.4.1)
5663
nap (>= 0.8, < 2.0)
5764
netrc (~> 0.11)
58-
cocoapods-try (1.1.0)
65+
cocoapods-try (1.2.0)
5966
colored (1.2)
6067
colored2 (3.1.2)
6168
commander-fastlane (4.4.6)
6269
highline (~> 1.7.2)
63-
concurrent-ruby (1.0.5)
70+
concurrent-ruby (1.1.6)
6471
declarative (0.0.10)
6572
declarative-option (0.1.0)
6673
domain_name (0.5.20180417)
6774
unf (>= 0.0.5, < 1.0.0)
6875
dotenv (2.5.0)
6976
emoji_regex (0.1.1)
7077
escape (0.0.4)
78+
ethon (0.12.0)
79+
ffi (>= 1.3.0)
7180
excon (0.62.0)
7281
faraday (0.15.3)
7382
multipart-post (>= 1.2, < 3)
@@ -113,7 +122,8 @@ GEM
113122
xcodeproj (>= 1.6.0, < 2.0.0)
114123
xcpretty (~> 0.3.0)
115124
xcpretty-travis-formatter (>= 0.0.3)
116-
fourflusher (2.0.1)
125+
ffi (1.12.2)
126+
fourflusher (2.3.1)
117127
fuzzy_match (2.0.4)
118128
gh_inspector (1.1.3)
119129
google-api-client (0.23.9)
@@ -145,7 +155,7 @@ GEM
145155
mime-types-data (3.2018.0812)
146156
mini_magick (4.5.1)
147157
mini_portile2 (2.3.0)
148-
minitest (5.11.3)
158+
minitest (5.14.0)
149159
molinillo (0.6.6)
150160
multi_json (1.13.1)
151161
multi_xml (0.6.0)
@@ -168,7 +178,7 @@ GEM
168178
uber (< 0.2.0)
169179
retriable (3.1.2)
170180
rouge (2.0.7)
171-
ruby-macho (1.3.1)
181+
ruby-macho (1.4.0)
172182
rubyzip (1.2.2)
173183
sbconstants (1.2.0)
174184
second_curtain (0.6.0)
@@ -192,15 +202,17 @@ GEM
192202
tty-screen (0.6.5)
193203
tty-spinner (0.8.0)
194204
tty-cursor (>= 0.5.0)
195-
tzinfo (1.2.5)
205+
typhoeus (1.3.1)
206+
ethon (>= 0.9.0)
207+
tzinfo (1.2.7)
196208
thread_safe (~> 0.1)
197209
uber (0.1.0)
198210
unf (0.1.4)
199211
unf_ext
200212
unf_ext (0.0.7.5)
201213
unicode-display_width (1.4.0)
202214
word_wrap (1.0.0)
203-
xcodeproj (1.7.0)
215+
xcodeproj (1.16.0)
204216
CFPropertyList (>= 2.3.3, < 4.0)
205217
atomos (~> 0.1.3)
206218
claide (>= 1.0.2, < 2.0)

‎Kiosk.xcodeproj/project.pbxproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1088,7 +1088,7 @@
10881088
files = (
10891089
);
10901090
inputPaths = (
1091-
"${SRCROOT}/Pods/Target Support Files/Pods-KioskTests/Pods-KioskTests-frameworks.sh",
1091+
"${PODS_ROOT}/Target Support Files/Pods-KioskTests/Pods-KioskTests-frameworks.sh",
10921092
"${BUILT_PRODUCTS_DIR}/RxSwift/RxSwift.framework",
10931093
"${BUILT_PRODUCTS_DIR}/FBSnapshotTestCase/FBSnapshotTestCase.framework",
10941094
"${BUILT_PRODUCTS_DIR}/Forgeries/Forgeries.framework",
@@ -1111,7 +1111,7 @@
11111111
);
11121112
runOnlyForDeploymentPostprocessing = 0;
11131113
shellPath = /bin/sh;
1114-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-KioskTests/Pods-KioskTests-frameworks.sh\"\n";
1114+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-KioskTests/Pods-KioskTests-frameworks.sh\"\n";
11151115
showEnvVarsInLog = 0;
11161116
};
11171117
22C6B74474A2FC89BCBEA1C5 /* [CP] Check Pods Manifest.lock */ = {
@@ -1138,7 +1138,8 @@
11381138
files = (
11391139
);
11401140
inputPaths = (
1141-
"${SRCROOT}/Pods/Target Support Files/Pods-Kiosk/Pods-Kiosk-frameworks.sh",
1141+
"${PODS_ROOT}/Target Support Files/Pods-Kiosk/Pods-Kiosk-frameworks.sh",
1142+
"${BUILT_PRODUCTS_DIR}/Keys/Keys.framework",
11421143
"${BUILT_PRODUCTS_DIR}/ARAnalytics/ARAnalytics.framework",
11431144
"${BUILT_PRODUCTS_DIR}/ARCollectionViewMasonryLayout/ARCollectionViewMasonryLayout.framework",
11441145
"${BUILT_PRODUCTS_DIR}/ARTiledImageView/ARTiledImageView.framework",
@@ -1155,7 +1156,6 @@
11551156
"${BUILT_PRODUCTS_DIR}/FLKAutoLayout/FLKAutoLayout.framework",
11561157
"${BUILT_PRODUCTS_DIR}/HockeySDK-Source/HockeySDK_Source.framework",
11571158
"${BUILT_PRODUCTS_DIR}/ISO8601DateFormatter/ISO8601DateFormatter.framework",
1158-
"${BUILT_PRODUCTS_DIR}/Keys/Keys.framework",
11591159
"${BUILT_PRODUCTS_DIR}/Moya/Moya.framework",
11601160
"${BUILT_PRODUCTS_DIR}/NJKWebViewProgress/NJKWebViewProgress.framework",
11611161
"${BUILT_PRODUCTS_DIR}/NSObject+Rx/NSObject_Rx.framework",
@@ -1175,6 +1175,7 @@
11751175
);
11761176
name = "[CP] Embed Pods Frameworks";
11771177
outputPaths = (
1178+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Keys.framework",
11781179
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ARAnalytics.framework",
11791180
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ARCollectionViewMasonryLayout.framework",
11801181
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ARTiledImageView.framework",
@@ -1191,7 +1192,6 @@
11911192
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FLKAutoLayout.framework",
11921193
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/HockeySDK_Source.framework",
11931194
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ISO8601DateFormatter.framework",
1194-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Keys.framework",
11951195
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Moya.framework",
11961196
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/NJKWebViewProgress.framework",
11971197
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/NSObject_Rx.framework",
@@ -1211,7 +1211,7 @@
12111211
);
12121212
runOnlyForDeploymentPostprocessing = 0;
12131213
shellPath = /bin/sh;
1214-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Kiosk/Pods-Kiosk-frameworks.sh\"\n";
1214+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Kiosk/Pods-Kiosk-frameworks.sh\"\n";
12151215
showEnvVarsInLog = 0;
12161216
};
12171217
/* End PBXShellScriptBuildPhase section */

‎Podfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
source 'https://github.com/CocoaPods/Specs.git'
21
source 'https://github.com/artsy/Specs.git'
2+
source 'https://cdn.cocoapods.org/'
33

44
plugin 'cocoapods-keys', {
55
:project => 'Eidolon',

‎Podfile.lock‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ PODS:
2020
- "Artsy+UIColors (~> 3.0)"
2121
- "Artsy+UIFonts"
2222
- Artsy-UIButtons (2.1.0):
23-
- Artsy+UIColors (~> 3.0)
24-
- Artsy+UIFonts
25-
- UIView+BooleanAnimations
23+
- "Artsy+UIColors (~> 3.0)"
24+
- "Artsy+UIFonts"
25+
- "UIView+BooleanAnimations"
2626
- CardFlight-v4 (4.3.1)
2727
- DZNWebViewController (2.0):
2828
- NJKWebViewProgress (~> 0.2)
@@ -125,19 +125,20 @@ DEPENDENCIES:
125125
- XNGMarkdownParser
126126

127127
SPEC REPOS:
128+
https://cdn.cocoapods.org/:
129+
- CardFlight-v4
128130
https://github.com/artsy/Specs.git:
129131
- "Artsy+UIColors"
130132
- "Artsy+UIFonts"
131133
- "Artsy+UILabels"
132134
- Artsy-UIButtons
133-
https://github.com/cocoapods/specs.git:
135+
https://github.com/CocoaPods/Specs.git:
134136
- Action
135137
- Alamofire
136138
- Analytics
137139
- ARAnalytics
138140
- ARCollectionViewMasonryLayout
139141
- ARTiledImageView
140-
- CardFlight
141142
- ECPhoneNumberFormatter
142143
- FBSnapshotTestCase
143144
- FLKAutoLayout
@@ -227,6 +228,6 @@ SPEC CHECKSUMS:
227228
"UIView+BooleanAnimations": a760be9a066036e55f298b7b7350a6cb14cfcd97
228229
XNGMarkdownParser: aed98c14f0c0eb20064184ddf9bac26c482722b2
229230

230-
PODFILE CHECKSUM: 9ab3f08861431cedc335a74566f4ea088dff3a0b
231+
PODFILE CHECKSUM: ce10ff768689cf9fdf33a44347efc78cc4d39c58
231232

232-
COCOAPODS: 1.5.3
233+
COCOAPODS: 1.9.1

0 commit comments

Comments
 (0)