diff options
| author |  Feng Xiao <xiaofeng@google.com> | 2016-07-23 00:39:28 +0000 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2016-07-23 00:39:28 +0000 |
| commit | 06220303323f3cce425706540defcd7a29d42ec2 (patch) | |
| tree | 5407311031eeff9416e551108305b48eab26f2a2 | |
| parent | 1b3796c89002659f7695ca1696e59a604305734b (diff) | |
| parent | 9702b9f78508dcbb2df4d090cdac6c3df41cdddb (diff) | |
Merge pull request #1830 from xfxyjwf/travis
Remove linux tests from travis.
| -rw-r--r-- | .travis.yml | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/.travis.yml b/.travis.yml index 9d7e4c5b..1417cb98 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,6 @@ sudo: required # 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: xcode7.3 @@ -47,23 +46,17 @@ matrix: # which doesn't work on OS X. - os: osx env: CONFIG=golang - # OS X/iOS tests of Objective C (needs Xcode, so it won't work on other - # platforms). - - os: linux - env: CONFIG=objectivec_ios_debug - - os: linux - env: CONFIG=objectivec_ios_release - - os: linux - env: CONFIG=objectivec_osx - - os: linux - env: CONFIG=objectivec_cocoapods_integration - # The dotnet environment requires Ubuntu 14.04 or 16.04. This - # configuration is effectively an "extra" one, outside the - # autogenerated matrix. 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 allow_failures: # These currently do not work on OS X but are being worked on by @haberman. - os: osx |