diff options
| author | Jisi Liu <liujisi@google.com> | 2016-07-29 14:27:53 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-29 14:27:53 -0700 |
| commit | 169d0ca43c5663c1b36cf4918f08aa031f5df468 (patch) | |
| tree | 4781b8c492591d73e7eea2b2abd4c546baf1d135 /.travis.yml | |
| parent | 42e54876be41fdf0b22dea4e4ea7f416d5d1f3ec (diff) | |
| parent | c4790429fc454a687312a48a22e30d93c29efd4d (diff) | |
| download | protobuf-169d0ca43c5663c1b36cf4918f08aa031f5df468.tar.gz protobuf-169d0ca43c5663c1b36cf4918f08aa031f5df468.tar.bz2 protobuf-169d0ca43c5663c1b36cf4918f08aa031f5df468.zip | |
Merge pull request #1893 from google/3.0.0-GA
Merge 3.0.0-GA into master
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index 1417cb98..094235e0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -57,6 +57,10 @@ matrix: # 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 allow_failures: # These currently do not work on OS X but are being worked on by @haberman. - os: osx |