Skip to content

Commit 50363dd

Browse files
committed
Update CI
1 parent f76e5cb commit 50363dd

File tree

5 files changed

+76
-26
lines changed

5 files changed

+76
-26
lines changed

.ruby-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
2.5.3

.swift-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
4.2

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
source 'https://rubygems.org'
22
gem 'synx'
3-
gem 'cocoapods', '~> 1.5.3'
3+
gem 'cocoapods', '~> 1.6.0.beta.2'
44
gem 'jazzy', '0.9'
55
gem 'fastlane'
66
gem 'xcpretty-travis-formatter'

Gemfile.lock

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,31 +13,31 @@ GEM
1313
babosa (1.0.2)
1414
claide (1.0.2)
1515
clamp (0.6.5)
16-
cocoapods (1.5.3)
16+
cocoapods (1.6.0.beta.2)
1717
activesupport (>= 4.0.2, < 5)
1818
claide (>= 1.0.2, < 2.0)
19-
cocoapods-core (= 1.5.3)
19+
cocoapods-core (= 1.6.0.beta.2)
2020
cocoapods-deintegrate (>= 1.0.2, < 2.0)
21-
cocoapods-downloader (>= 1.2.0, < 2.0)
21+
cocoapods-downloader (>= 1.2.2, < 2.0)
2222
cocoapods-plugins (>= 1.0.0, < 2.0)
2323
cocoapods-search (>= 1.0.0, < 2.0)
2424
cocoapods-stats (>= 1.0.0, < 2.0)
25-
cocoapods-trunk (>= 1.3.0, < 2.0)
25+
cocoapods-trunk (>= 1.3.1, < 2.0)
2626
cocoapods-try (>= 1.1.0, < 2.0)
2727
colored2 (~> 3.1)
2828
escape (~> 0.0.4)
2929
fourflusher (~> 2.0.1)
3030
gh_inspector (~> 1.0)
31-
molinillo (~> 0.6.5)
31+
molinillo (~> 0.6.6)
3232
nap (~> 1.0)
33-
ruby-macho (~> 1.1)
34-
xcodeproj (>= 1.5.7, < 2.0)
35-
cocoapods-core (1.5.3)
33+
ruby-macho (~> 1.3, >= 1.3.1)
34+
xcodeproj (>= 1.7.0, < 2.0)
35+
cocoapods-core (1.6.0.beta.2)
3636
activesupport (>= 4.0.2, < 6)
3737
fuzzy_match (~> 2.0.4)
3838
nap (~> 1.0)
3939
cocoapods-deintegrate (1.0.2)
40-
cocoapods-downloader (1.2.1)
40+
cocoapods-downloader (1.2.2)
4141
cocoapods-plugins (1.0.0)
4242
nap
4343
cocoapods-search (1.0.0)
@@ -169,7 +169,7 @@ GEM
169169
uber (< 0.2.0)
170170
retriable (3.1.2)
171171
rouge (1.11.1)
172-
ruby-macho (1.2.0)
172+
ruby-macho (1.3.1)
173173
rubyzip (1.2.2)
174174
sass (3.6.0)
175175
sass-listen (~> 4.0.0)
@@ -224,7 +224,7 @@ PLATFORMS
224224
ruby
225225

226226
DEPENDENCIES
227-
cocoapods (~> 1.5.3)
227+
cocoapods (~> 1.6.0.beta.2)
228228
fastlane
229229
jazzy (= 0.9)
230230
synx

build-ci.sh

Lines changed: 62 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ DERIVED_DATA=${1:-/tmp/PinLayout}
44
set -o pipefail &&
55
rm -rf $DERIVED_DATA &&
66

7-
echo "===============================" &&
8-
echo "fastlane iOS travis" &&
9-
echo "===============================" &&
7+
# echo "===============================" &&
8+
# echo "fastlane iOS travis" &&
9+
# echo "===============================" &&
1010
# time bundle exec fastlane ios travis &&
1111

1212
# echo "===============================" &&
@@ -15,40 +15,79 @@ echo "===============================" &&
1515
# time bundle exec fastlane mac travis &&
1616

1717

18+
echo "===============================" &&
19+
echo "PinLayout-iOS" &&
20+
echo "===============================" &&
21+
time xcodebuild build -project PinLayout.xcodeproj -scheme PinLayout-iOS \
22+
-derivedDataPath $DERIVED_DATA -sdk iphonesimulator12.0 \
23+
-destination 'platform=iOS Simulator,name=iPhone 6,OS=9.3' \
24+
| xcpretty &&
25+
26+
echo "===============================" &&
27+
echo "PinLayout-tvOS" &&
28+
echo "===============================" &&
29+
time xcodebuild build -project PinLayout.xcodeproj -scheme PinLayout-tvOS \
30+
-derivedDataPath $DERIVED_DATA -sdk appletvsimulator12.0 \
31+
-destination 'platform=tvOS Simulator,name=Apple TV 4K,OS=12.0' \
32+
| xcpretty &&
33+
34+
echo "===============================" &&
35+
echo "PinLayout-macOS" &&
36+
echo "===============================" &&
37+
time xcodebuild build -project PinLayout.xcodeproj -scheme PinLayout-macOS \
38+
-derivedDataPath $DERIVED_DATA -sdk macosx10.14 \
39+
| xcpretty &&
40+
41+
echo "===============================" &&
42+
echo "PinLayoutSample" &&
43+
echo "===============================" &&
44+
time xcodebuild build test -workspace PinLayout.xcworkspace -scheme PinLayoutSample \
45+
-derivedDataPath $DERIVED_DATA -sdk iphonesimulator12.0 \
46+
-destination 'platform=iOS Simulator,name=iPhone 6,OS=9.3' \
47+
| xcpretty &&
48+
49+
1850
echo "===============================" &&
1951
echo "iOS unit test" &&
2052
echo "===============================" &&
21-
time xcodebuild build test -workspace PinLayout.xcworkspace -scheme PinLayout-iOS -derivedDataPath $DERIVED_DATA -sdk iphonesimulator12.0 \
53+
time xcodebuild build test -workspace PinLayout.xcworkspace -scheme PinLayout-iOS \
54+
-derivedDataPath $DERIVED_DATA -sdk iphonesimulator12.0 \
2255
-destination 'platform=iOS Simulator,name=iPhone 6,OS=9.3' \
2356
| xcpretty &&
2457

25-
time xcodebuild build test -workspace PinLayout.xcworkspace -scheme PinLayout-iOS -derivedDataPath $DERIVED_DATA -sdk iphonesimulator12.0 \
58+
time xcodebuild build test -workspace PinLayout.xcworkspace -scheme PinLayout-iOS \
59+
-derivedDataPath $DERIVED_DATA -sdk iphonesimulator12.0 \
2660
-destination 'platform=iOS Simulator,name=iPhone 7,OS=10.2' \
2761
| xcpretty &&
2862

29-
time xcodebuild build test -workspace PinLayout.xcworkspace -scheme PinLayout-iOS -derivedDataPath $DERIVED_DATA -sdk iphonesimulator12.0 \
63+
time xcodebuild build test -workspace PinLayout.xcworkspace -scheme PinLayout-iOS \
64+
-derivedDataPath $DERIVED_DATA -sdk iphonesimulator12.0 \
3065
-destination 'platform=iOS Simulator,name=iPhone 8,OS=11.4' \
3166
| xcpretty &&
3267

33-
time xcodebuild build test -workspace PinLayout.xcworkspace -scheme PinLayout-iOS -derivedDataPath $DERIVED_DATA -sdk iphonesimulator12.0 \
68+
time xcodebuild build test -workspace PinLayout.xcworkspace -scheme PinLayout-iOS \
69+
-derivedDataPath $DERIVED_DATA -sdk iphonesimulator12.0 \
3470
-destination 'platform=iOS Simulator,name=iPhone XS,OS=12.0' \
3571
| xcpretty &&
3672

3773
echo "===============================" &&
3874
echo "tvOS unit test" &&
3975
echo "===============================" &&
40-
time xcodebuild build test -workspace PinLayout.xcworkspace -scheme PinLayout-tvOS -derivedDataPath $DERIVED_DATA -sdk appletvsimulator12.0 \
76+
time xcodebuild build test -workspace PinLayout.xcworkspace -scheme PinLayout-tvOS \
77+
-derivedDataPath $DERIVED_DATA -sdk appletvsimulator12.0 \
4178
-destination 'platform=tvOS Simulator,name=Apple TV 4K,OS=11.4' \
4279
| xcpretty &&
4380

44-
time xcodebuild build test -workspace PinLayout.xcworkspace -scheme PinLayout-tvOS -derivedDataPath $DERIVED_DATA -sdk appletvsimulator12.0 \
81+
time xcodebuild build test -workspace PinLayout.xcworkspace -scheme PinLayout-tvOS \
82+
-derivedDataPath $DERIVED_DATA -sdk appletvsimulator12.0 \
4583
-destination 'platform=tvOS Simulator,name=Apple TV 4K,OS=12.0' \
4684
| xcpretty &&
4785

4886
echo "===============================" &&
4987
echo "macOS unit test" &&
5088
echo "===============================" &&
51-
time xcodebuild clean test -workspace PinLayout.xcworkspace -scheme PinLayout-macOS -derivedDataPath $DERIVED_DATA -sdk macosx10.14 \
89+
time xcodebuild clean test -workspace PinLayout.xcworkspace -scheme PinLayout-macOS \
90+
-derivedDataPath $DERIVED_DATA -sdk macosx10.14 \
5291
| xcpretty &&
5392

5493

@@ -58,7 +97,8 @@ echo "===============================" &&
5897
cd TestProjects/cocoapods/ios &&
5998
rm -rf $DERIVED_DATA &&
6099
pod install &&
61-
time xcodebuild clean build -workspace PinLayout-iOS.xcworkspace -scheme PinLayout-iOS -sdk iphonesimulator12.0 -derivedDataPath $DERIVED_DATA \
100+
time xcodebuild clean build -workspace PinLayout-iOS.xcworkspace -scheme PinLayout-iOS \
101+
-sdk iphonesimulator12.0 -derivedDataPath $DERIVED_DATA \
62102
-destination 'platform=iOS Simulator,name=iPhone 8,OS=12.0' \
63103
| xcpretty &&
64104
cd ../../.. &&
@@ -70,7 +110,8 @@ echo "===============================" &&
70110
cd TestProjects/cocoapods/macos &&
71111
rm -rf $DERIVED_DATA &&
72112
pod install &&
73-
time xcodebuild clean build -workspace PinLayout-macOS.xcworkspace -scheme PinLayout-macOS -sdk macosx10.14 -derivedDataPath $DERIVED_DATA \
113+
time xcodebuild clean build -workspace PinLayout-macOS.xcworkspace -scheme PinLayout-macOS \
114+
-sdk macosx10.14 -derivedDataPath $DERIVED_DATA \
74115
| xcpretty &&
75116
cd ../../.. &&
76117

@@ -81,7 +122,8 @@ echo "===============================" &&
81122
cd TestProjects/cocoapods/tvos &&
82123
rm -rf $DERIVED_DATA &&
83124
pod install &&
84-
time xcodebuild clean build -workspace PinLayout-tvOS.xcworkspace -scheme PinLayout-tvOS -sdk appletvsimulator12.0 -derivedDataPath $DERIVED_DATA \
125+
time xcodebuild clean build -workspace PinLayout-tvOS.xcworkspace -scheme PinLayout-tvOS \
126+
-sdk appletvsimulator12.0 -derivedDataPath $DERIVED_DATA \
85127
-destination 'platform=tvOS Simulator,name=Apple TV,OS=12.0' \
86128
| xcpretty &&
87129
cd ../../.. &&
@@ -95,11 +137,17 @@ rm -rf $DERIVED_DATA &&
95137
rm Cartfile &&
96138
echo "git \"$TRAVIS_BUILD_DIR\" \"$TRAVIS_BRANCH\"" > Cartfile &&
97139
carthage update --use-ssh --platform iOS &&
98-
time xcodebuild clean build -project PinLayout-Carthage-iOS.xcodeproj -scheme PinLayout-Carthage-iOS -sdk iphonesimulator12.0 -derivedDataPath $DERIVED_DATA \
140+
time xcodebuild clean build -project PinLayout-Carthage-iOS.xcodeproj \
141+
-scheme PinLayout-Carthage-iOS -sdk iphonesimulator12.0 \
142+
-derivedDataPath $DERIVED_DATA \
99143
-destination 'platform=iOS Simulator,name=iPhone 7,OS=12.0' \
100144
| xcpretty &&
101145
cd ../../..
102146

147+
echo "===============================" &&
148+
echo " Pod lib lint" &&
149+
echo "===============================" &&
150+
time bundle exec pod lib lint --allow-warnings
103151

104152
# echo "==========================================" &&
105153
# echo " Swift Package Manager: iOS Empty project " &&

0 commit comments

Comments
 (0)