Index: third_party/protobuf/.travis.yml |
diff --git a/third_party/protobuf/.travis.yml b/third_party/protobuf/.travis.yml |
index e368826f0b5ec5b8b431d347c2980cc3460875f5..bcf3851bc216a77201b4b103a50b9c718f295362 100644 |
--- a/third_party/protobuf/.travis.yml |
+++ b/third_party/protobuf/.travis.yml |
@@ -7,10 +7,10 @@ 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 |
+ - ./tests.sh $CONFIG |
env: |
- CONFIG=cpp |
- CONFIG=cpp_distcheck |
@@ -67,5 +67,18 @@ 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 |
+ # xctool 0.2.8 seems to have a bug where it randomly kills tests saying |
+ # they failed. |
+ # https://github.com/facebook/xctool/issues/619 |
+ # https://github.com/google/protobuf/issues/1232 |
+ # travis updated their images to include 0.2.8: |
+ # https://blog.travis-ci.com/2016-03-23-xcode-image-updates |
+ # Mark the iOS test as flakey so these failures don't turn things red. |
+ - os: osx |
+ env: CONFIG=objectivec_ios |
notifications: |
email: false |