diff options
Diffstat (limited to 'travis.sh')
-rwxr-xr-x | travis.sh | 15 |
1 files changed, 10 insertions, 5 deletions
@@ -179,8 +179,10 @@ internal_objectivec_common () { } internal_xctool_debug_and_release() { - xctool -configuration Debug "$@" - xctool -configuration Release "$@" + # Always use -reporter plain to avoid escape codes in output (makes travis + # logs easier to read). + xctool -reporter plain -configuration Debug "$@" + xctool -reporter plain -configuration Release "$@" } build_objectivec_ios() { @@ -195,17 +197,20 @@ build_objectivec_ios() { build-tests IOS_DESTINATIONS=( "platform=iOS Simulator,name=iPhone 4s,OS=8.1" # 32bit - "platform=iOS Simulator,name=iPhone 6,OS=9.1" # 64bit + "platform=iOS Simulator,name=iPhone 6,OS=9.2" # 64bit "platform=iOS Simulator,name=iPad 2,OS=8.1" # 32bit - "platform=iOS Simulator,name=iPad Air,OS=9.1" # 64bit + "platform=iOS Simulator,name=iPad Air,OS=9.2" # 64bit ) for i in "${IOS_DESTINATIONS[@]}" ; do + # Throw -newSimulatorInstance in incase it helps with the flake that + # started happening after xctool 0.2.8 got released. internal_xctool_debug_and_release \ -project objectivec/ProtocolBuffers_iOS.xcodeproj \ -scheme ProtocolBuffers \ -sdk iphonesimulator \ -destination "${i}" \ - run-tests + run-tests \ + -newSimulatorInstance done } |