diff options
Diffstat (limited to 'travis.sh')
| -rwxr-xr-x | travis.sh | 18 |
1 files changed, 13 insertions, 5 deletions
@@ -171,7 +171,13 @@ internal_objectivec_common () { # http://docs.travis-ci.com/user/osx-ci-environment/ # We don't use a before_install because we test multiple OSes. brew update - brew outdated xctool || brew upgrade xctool + # xctool 0.2.8 seems to have a bug where it randomly kills tests saying + # they failed. Disabling the updates, but letting it report about being + # updates as a hint that this needs to eventually get re-enabled. + # https://github.com/facebook/xctool/issues/619 + # https://github.com/google/protobuf/issues/1232 + brew outdated xctool || true + #brew outdated xctool || brew upgrade xctool # Reused the build script that takes care of configuring and ensuring things # are up to date. Xcode and conformance tests will be directly invoked. objectivec/DevTools/full_mac_build.sh \ @@ -179,8 +185,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,9 +203,9 @@ 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 internal_xctool_debug_and_release \ |