diff options
author | Feng Xiao <xiaofeng@google.com> | 2016-07-21 21:03:55 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-07-21 21:03:55 +0000 |
commit | 2ba058c66c10781d57a332987be23e3fed0f9e1c (patch) | |
tree | 0a8744a6db7477ed9224949bf8aaf0c2e9f13174 /.travis.yml | |
parent | 30d8416c1cf69c7e349811b38a91dbc810fc66bd (diff) | |
parent | ad49ed78f3b0d03093274450637bd060d26fb58f (diff) | |
download | protobuf-2ba058c66c10781d57a332987be23e3fed0f9e1c.tar.gz protobuf-2ba058c66c10781d57a332987be23e3fed0f9e1c.tar.bz2 protobuf-2ba058c66c10781d57a332987be23e3fed0f9e1c.zip |
Merge pull request #1822 from xfxyjwf/java6
Update travis tests for Java.
Diffstat (limited to '.travis.yml')
-rw-r--r-- | .travis.yml | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index 7cfe0dfb..f5117134 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,10 +15,8 @@ env: - CONFIG=cpp - CONFIG=cpp_distcheck - CONFIG=golang - - CONFIG=java_jdk6 - CONFIG=java_jdk7 - CONFIG=java_oracle7 - - CONFIG=javanano_jdk6 - CONFIG=javanano_jdk7 - CONFIG=javanano_oracle7 - CONFIG=javascript @@ -40,14 +38,10 @@ matrix: # 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 |