diff options
Diffstat (limited to '.travis.yml')
-rw-r--r-- | .travis.yml | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index bd9a5dfb..7011546e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ language: cpp os: - osx # The Objective C build needs Xcode 7.0 or later. -osx_image: xcode8 +osx_image: xcode8.1 script: - ./tests.sh $CONFIG env: @@ -73,6 +73,10 @@ matrix: # we moved to an OS X image that is 10.11. - os: osx env: CONFIG=python_cpp + # This started failing with the OS X 10.12 / Xcode 8.1 image. + # https://github.com/google/protobuf/issues/2472 + - os: osx + env: CONFIG=objectivec_cocoapods_integration # Mark the iOS test as flakey as xcodebuild some times fails to start the # iOS Simulator. - os: osx |