diff options
author | Adam Cozzette <acozzette@google.com> | 2017-12-01 10:05:19 -0800 |
---|---|---|
committer | Adam Cozzette <acozzette@google.com> | 2017-12-01 10:05:19 -0800 |
commit | 0ba8eea655a5e40d19ab95c773192b5d908c5a61 (patch) | |
tree | 4c2c97ade1ab197d361c146bacae5adde55986bf /.travis.yml | |
parent | 92a7e778e7394386f413cec28d67a07630f784b1 (diff) | |
parent | a711e3d5b4ee1dd7f9d21197dca8432a5819a64e (diff) | |
download | protobuf-0ba8eea655a5e40d19ab95c773192b5d908c5a61.tar.gz protobuf-0ba8eea655a5e40d19ab95c773192b5d908c5a61.tar.bz2 protobuf-0ba8eea655a5e40d19ab95c773192b5d908c5a61.zip |
Merge branch 'master' into down-integrate
Diffstat (limited to '.travis.yml')
-rw-r--r-- | .travis.yml | 124 |
1 files changed, 62 insertions, 62 deletions
diff --git a/.travis.yml b/.travis.yml index e7853ebe..4cfc5bf0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,55 +1,65 @@ -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. +# Everything is driven by the test.sh, so the language doesn't really +# matter, it just controls the default install/script/etc. steps on +# travis. language: cpp -os: - - osx -# The Objective C build needs Xcode 7.0 or later. -osx_image: xcode8.3 -script: - - ./tests.sh $CONFIG -env: - - CONFIG=cpp - - CONFIG=cpp_distcheck - - CONFIG=golang - - CONFIG=java_jdk7 - - CONFIG=java_oracle7 - - 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=ruby21 - - CONFIG=ruby22 - - CONFIG=jruby - - CONFIG=php5.6_mac - - CONFIG=php7.0_mac +script: ./tests.sh $CONFIG + +# The test matrix is manually built to cover a mix of linux and macOS +# hosted setups; this lets some extra settings be done specific to each +# host/language instead of forcing common values on all the tests. 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. + include: + # ----------------------------------------------------------------- + # macOS hosted tests for Objective-C + + - os: osx + env: CONFIG=objectivec_osx + osx_image: xcode9.1 + language: objective-c + # iOS build log was starting to choke travis UI, so split to cover the + # Xcode Debug and Release Configurations independently. - os: osx - env: CONFIG=java_jdk7 + env: CONFIG=objectivec_ios_debug + osx_image: xcode9.1 + language: objective-c - os: osx - env: CONFIG=java_oracle7 + env: CONFIG=objectivec_ios_release + osx_image: xcode9.1 + language: objective-c - os: osx - env: CONFIG=javanano_jdk7 + env: CONFIG=objectivec_cocoapods_integration + osx_image: xcode9.1 + language: objective-c + + # ----------------------------------------------------------------- + # macOS hosted tests for other languages. + - os: osx - env: CONFIG=javanano_oracle7 - # Requires installing golang, currently travis.sh is doing that with apt-get - # which doesn't work on OS X. + env: CONFIG=cpp - os: osx - env: CONFIG=golang - include: + env: CONFIG=cpp_distcheck + - os: osx + env: CONFIG=javascript + - os: osx + env: CONFIG=python + - os: osx + env: CONFIG=python_cpp + - os: osx + env: CONFIG=php5.6_mac + # Xcode versions force a host version of macOS: + # https://docs.travis-ci.com/user/reference/osx/#OS-X-Version + # Force macOS 10.12, the default travis image is going to be + # updated "soon", at which point this came come out: + # https://blog.travis-ci.com/2017-10-16-a-new-default-os-x-image-is-coming + osx_image: xcode8.3 + - os: osx + env: CONFIG=php7.0_mac + # Same note about macOS version as on the php5.6_mac config. + osx_image: xcode8.3 + + # ----------------------------------------------------------------- + # Linux hosted tests + # The dotnet environment requires Ubuntu 14.04 or 16.04. This # configuration is effectively an "extra" one, outside the # autogenerated matrix. @@ -57,7 +67,8 @@ matrix: env: CONFIG=csharp language: csharp dist: trusty - dotnet: 1.0.1 + sudo: required + dotnet: 1.0.4 mono: none # This test is kept on travis because it doesn't play nicely with other # tests on jenkins running in parallel. @@ -67,25 +78,14 @@ matrix: # fetch pre-built Linux protoc binaries in the test. - os: linux env: CONFIG=java_compatibility + sudo: required + dist: trusty # The Python compatibility test currently only runs on Linux because it will # fetch pre-built Linux protoc binaries in the test. - os: linux env: CONFIG=python_compatibility - allow_failures: - # These currently do not work on OS X but are being worked on by @haberman. - - os: osx - 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 - # Mark the iOS test as flakey as xcodebuild some times fails to start the - # iOS Simulator. - - os: osx - env: CONFIG=objectivec_ios_debug - - os: osx - env: CONFIG=objectivec_ios_release + sudo: required + dist: trusty + notifications: email: false |