From 1324119a42b9c8cedd328b6adfa5ef00243651f6 Mon Sep 17 00:00:00 2001
From: Thomas Van Lenten <thomasvl@google.com>
Date: Tue, 16 Feb 2016 09:19:50 -0500
Subject: 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.
---
 .travis.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index e368826f..c0309fab 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,8 +7,8 @@ language: cpp
 os:
   - linux
   - osx
-# The Objective C build needs Xcode 6.4 or later.
-osx_image: xcode7.1
+# The Objective C build needs Xcode 7.0 or later.
+osx_image: xcode7.2
 script:
   - ./travis.sh $CONFIG
 env:
@@ -67,5 +67,8 @@ matrix:
       env: CONFIG=ruby22
     - os: osx
       env: CONFIG=jruby
+    # Currently showing flake randomly, doesn't trace back to a single commit.
+    - os: osx
+      env: CONFIG=objectivec_ios
 notifications:
   email: false
-- 
cgit v1.2.3