Skip to content

Commit

Permalink
Upgrade CI to xcode 9.4
Browse files Browse the repository at this point in the history
  • Loading branch information
Luc Dion committed Aug 15, 2018
1 parent e3290a8 commit e8c01cf
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
language: objective-c
osx_image: xcode9.3
osx_image: xcode9.4
cache: bundler

install:
Expand Down
22 changes: 11 additions & 11 deletions build-ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ time bundle exec fastlane mac travis &&
echo "===============================" &&
echo "iOS unit test" &&
echo "===============================" &&
time xcodebuild build test -workspace PinLayout.xcworkspace -scheme PinLayout-iOS -derivedDataPath $DERIVED_DATA -sdk iphonesimulator11.3 \
-destination 'platform=iOS Simulator,name=iPhone 7 Plus,OS=11.3' \
-destination 'platform=iOS Simulator,name=iPhone 7,OS=11.3' \
time xcodebuild build test -workspace PinLayout.xcworkspace -scheme PinLayout-iOS -derivedDataPath $DERIVED_DATA -sdk iphonesimulator11.4 \
-destination 'platform=iOS Simulator,name=iPhone 7 Plus,OS=11.4' \
-destination 'platform=iOS Simulator,name=iPhone 7,OS=11.4' \
-destination 'platform=iOS Simulator,name=iPhone 6,OS=10.2'\
| xcpretty &&

Expand All @@ -40,8 +40,8 @@ echo "===============================" &&
cd TestProjects/cocoapods/ios &&
rm -rf $DERIVED_DATA &&
pod install &&
time xcodebuild clean build -workspace PinLayout-iOS.xcworkspace -scheme PinLayout-iOS -sdk iphonesimulator11.3 -derivedDataPath $DERIVED_DATA \
-destination 'platform=iOS Simulator,name=iPhone 7,OS=11.3' \
time xcodebuild clean build -workspace PinLayout-iOS.xcworkspace -scheme PinLayout-iOS -sdk iphonesimulator11.4 -derivedDataPath $DERIVED_DATA \
-destination 'platform=iOS Simulator,name=iPhone 7,OS=11.4' \
| xcpretty &&
cd ../../..

Expand All @@ -63,8 +63,8 @@ echo "===============================" &&
cd TestProjects/cocoapods/tvos &&
rm -rf $DERIVED_DATA &&
pod install &&
time xcodebuild clean build -workspace PinLayout-tvOS.xcworkspace -scheme PinLayout-tvOS -sdk appletvsimulator11.3 -derivedDataPath $DERIVED_DATA \
-destination 'platform=tvOS Simulator,name=Apple TV,OS=11.3' \
time xcodebuild clean build -workspace PinLayout-tvOS.xcworkspace -scheme PinLayout-tvOS -sdk appletvsimulator11.4 -derivedDataPath $DERIVED_DATA \
-destination 'platform=tvOS Simulator,name=Apple TV,OS=11.4' \
| xcpretty &&
cd ../../..

Expand All @@ -77,8 +77,8 @@ rm -rf $DERIVED_DATA &&
rm Cartfile &&
echo "git \"$TRAVIS_BUILD_DIR\" \"$TRAVIS_BRANCH\"" > Cartfile &&
carthage update --use-ssh --platform iOS &&
time xcodebuild clean build -project PinLayout-Carthage-iOS.xcodeproj -scheme PinLayout-Carthage-iOS -sdk iphonesimulator11.3 -derivedDataPath $DERIVED_DATA \
-destination 'platform=iOS Simulator,name=iPhone 7,OS=11.3' \
time xcodebuild clean build -project PinLayout-Carthage-iOS.xcodeproj -scheme PinLayout-Carthage-iOS -sdk iphonesimulator11.4 -derivedDataPath $DERIVED_DATA \
-destination 'platform=iOS Simulator,name=iPhone 7,OS=11.4' \
| xcpretty &&
cd ../../..

Expand All @@ -91,8 +91,8 @@ cd ../../..
# rm -rf .build &&
# rm Package.pins
# swift package show-dependencies --format json &&
# time xcodebuild clean build -project PinLayout-Carthage-iOS.xcodeproj -scheme PinLayout-Carthage-iOS -sdk iphonesimulator11.3 -derivedDataPath $DERIVED_DATA \
# -destination 'platform=iOS Simulator,name=iPhone 7,OS=11.3' \
# time xcodebuild clean build -project PinLayout-Carthage-iOS.xcodeproj -scheme PinLayout-Carthage-iOS -sdk iphonesimulator11.4 -derivedDataPath $DERIVED_DATA \
# -destination 'platform=iOS Simulator,name=iPhone 7,OS=11.4' \
# | xcpretty &&
# cd ../../..
#
Expand Down

0 comments on commit e8c01cf

Please sign in to comment.