diff options
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index e368826f..9bc4d88f 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,9 @@ matrix: env: CONFIG=ruby22 - os: osx env: CONFIG=jruby + # https://github.com/google/protobuf/issues/1253 - Started failing when + # we moved to an OS X image that is 10.11. + - os: osx + env: CONFIG=python_cpp notifications: email: false |