diff options
| author | Jon Skeet <skeet@pobox.com> | 2015-06-17 15:03:47 +0100 |
|---|---|---|
| committer | Jon Skeet <skeet@pobox.com> | 2015-06-17 15:03:47 +0100 |
| commit | e2acd854250b449a3fdeef2ad52402c4c5d78259 (patch) | |
| tree | a08126762b6c76d56fde8ce443f8dff36408b6e0 /.travis.yml | |
| parent | d9dc05e500807a6f0cd10d4637c599acc9a6aecf (diff) | |
| parent | b36395b2bac88f70070544c325bc09234cb1f1a6 (diff) | |
| download | protobuf-e2acd854250b449a3fdeef2ad52402c4c5d78259.tar.gz protobuf-e2acd854250b449a3fdeef2ad52402c4c5d78259.tar.bz2 protobuf-e2acd854250b449a3fdeef2ad52402c4c5d78259.zip | |
Merged master
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index 9dc99b4e..4edf3b30 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,8 @@ sudo: required +# 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 @@ -22,5 +26,31 @@ env: - CONFIG=ruby21 - CONFIG=ruby22 - CONFIG=jruby +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 + 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 notifications: email: false |