diff options
| author |  Thomas Van Lenten <thomasvl@google.com> | 2016-02-16 09:19:50 -0500 |
|---|---|---|
| committer | Thomas Van Lenten <thomasvl@google.com> | 2016-02-16 09:19:50 -0500 |
| commit | 1324119a42b9c8cedd328b6adfa5ef00243651f6 (patch) | |
| tree | 9db54f1e411c98582e1908afb82e0aa59208dc3f /.travis.yml | |
| parent | e35e24800fb8d694bdeea5fd63dc7d1b14d68723 (diff) | |
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.yml')
| -rw-r--r-- | .travis.yml | 7 |
1 files changed, 5 insertions, 2 deletions
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 |