diff options
| author |  Thomas Van Lenten <thomasvl@google.com> | 2016-12-09 11:15:06 -0500 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2016-12-09 11:15:06 -0500 |
| commit | e43f73e09906004a0ccd2644984dbbae07c595da (patch) | |
| tree | 36cb4505f06d9cf05bfa9e254fc35a08a443fe6d /.travis.yml | |
| parent | 243ebec887a2095cdba6773cb9151b3509a3fc5e (diff) | |
| parent | 70e21d7cf9bce62ccae8ab89088873598b14238e (diff) | |
Merge pull request #2473 from thomasvl/update_xcodes
Update xcode version support and travis usage
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 |