aboutsummaryrefslogtreecommitdiff
path: root/travis.sh
diff options
context:
space:
mode:
authorThomas Van Lenten <thomasvl@google.com>2016-02-16 09:19:50 -0500
committerThomas Van Lenten <thomasvl@google.com>2016-02-16 09:19:50 -0500
commit1324119a42b9c8cedd328b6adfa5ef00243651f6 (patch)
tree9db54f1e411c98582e1908afb82e0aa59208dc3f /travis.sh
parente35e24800fb8d694bdeea5fd63dc7d1b14d68723 (diff)
downloadprotobuf-1324119a42b9c8cedd328b6adfa5ef00243651f6.tar.gz
protobuf-1324119a42b9c8cedd328b6adfa5ef00243651f6.tar.bz2
protobuf-1324119a42b9c8cedd328b6adfa5ef00243651f6.zip
Bump up travis to Xcode 7.2
- Update simulator versions used. - Mark the iOS tests as flaky while trying to dig out the root cause.
Diffstat (limited to 'travis.sh')
-rwxr-xr-xtravis.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/travis.sh b/travis.sh
index 5a77a2a8..13a109a6 100755
--- a/travis.sh
+++ b/travis.sh
@@ -195,9 +195,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 \