Index: third_party/protobuf/.travis.yml |
diff --git a/third_party/protobuf/.travis.yml b/third_party/protobuf/.travis.yml |
index a34cb83bebb1174b2baaa5e25a0061a0e8e98e93..bcf3851bc216a77201b4b103a50b9c718f295362 100644 |
--- a/third_party/protobuf/.travis.yml |
+++ b/third_party/protobuf/.travis.yml |
@@ -1,68 +1,66 @@ |
sudo: required |
-dist: trusty |
# Note: travis currently does not support listing more than one language so |
# this cheats and claims to only be cpp. If they add multiple language |
# support, this should probably get updated to install steps and/or |
# rvm/gemfile/jdk/etc. entries rather than manually doing the work. |
language: cpp |
os: |
+ - linux |
- osx |
# The Objective C build needs Xcode 7.0 or later. |
-osx_image: xcode8.1 |
+osx_image: xcode7.2 |
script: |
- ./tests.sh $CONFIG |
env: |
- CONFIG=cpp |
- CONFIG=cpp_distcheck |
+ - CONFIG=csharp |
- CONFIG=golang |
+ - CONFIG=java_jdk6 |
- CONFIG=java_jdk7 |
- CONFIG=java_oracle7 |
+ - CONFIG=javanano_jdk6 |
- CONFIG=javanano_jdk7 |
- CONFIG=javanano_oracle7 |
- CONFIG=javascript |
- # iOS build log was starting to choke travis UI, so split to cover the |
- # Xcode Debug and Release Configurations independently. |
- - CONFIG=objectivec_ios_debug |
- - CONFIG=objectivec_ios_release |
- - CONFIG=objectivec_osx |
- - CONFIG=objectivec_cocoapods_integration |
- CONFIG=python |
- CONFIG=python_cpp |
+ - CONFIG=ruby19 |
+ - CONFIG=ruby20 |
- CONFIG=ruby21 |
- CONFIG=ruby22 |
- CONFIG=jruby |
- - CONFIG=php5.6_mac |
matrix: |
exclude: |
# It's nontrivial to programmatically install a new JDK from the command |
# line on OS X, so we rely on testing on Linux for Java code. |
- os: osx |
+ env: CONFIG=java_jdk6 |
+ - os: osx |
env: CONFIG=java_jdk7 |
- os: osx |
env: CONFIG=java_oracle7 |
- os: osx |
+ env: CONFIG=javanano_jdk6 |
+ - os: osx |
env: CONFIG=javanano_jdk7 |
- os: osx |
env: CONFIG=javanano_oracle7 |
+ # Requires installing mono, currently travis.sh is doing that with apt-get |
+ # which doesn't work on OS X. |
+ - os: osx |
+ env: CONFIG=csharp |
# Requires installing golang, currently travis.sh is doing that with apt-get |
# which doesn't work on OS X. |
- os: osx |
env: CONFIG=golang |
+ # Add into the matrix OS X tests of Objective C (needs Xcode, so it won't |
+ # work on other platforms). These are split so it doesn't take as long to run. |
include: |
- # The dotnet environment requires Ubuntu 14.04 or 16.04. This |
- # configuration is effectively an "extra" one, outside the |
- # autogenerated matrix. |
- - os: linux |
- env: CONFIG=csharp |
- dist: trusty |
- # This test is kept on travis because it doesn't play nicely with other |
- # tests on jenkins running in parallel. |
- - os: linux |
- env: CONFIG=cpp_distcheck |
- # The Java compatibility test currently only runs on Linux because it will |
- # fetch pre-built Linux protoc binaries in the test. |
- - os: linux |
- env: CONFIG=java_compatibility |
+ - os: osx |
+ env: CONFIG=objectivec_ios |
+ - os: osx |
+ env: CONFIG=objectivec_osx |
allow_failures: |
# These currently do not work on OS X but are being worked on by @haberman. |
- os: osx |
@@ -73,11 +71,14 @@ matrix: |
# we moved to an OS X image that is 10.11. |
- os: osx |
env: CONFIG=python_cpp |
- # Mark the iOS test as flakey as xcodebuild some times fails to start the |
- # iOS Simulator. |
- - os: osx |
- env: CONFIG=objectivec_ios_debug |
+ # 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_release |
+ env: CONFIG=objectivec_ios |
notifications: |
email: false |