aboutsummaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorEric Anderson <ejona@google.com>2016-09-27 17:15:12 -0700
committerEric Anderson <ejona@google.com>2016-09-29 10:25:31 -0700
commitb1d72e5c3ecaad3351b95d74657c99e484cd496c (patch)
tree41ddae96a97ef016c5aa4af05a46494b405fa830 /.travis.yml
parent34812835a80f1255d47edcdccdd625a81078ba86 (diff)
downloadgrpc-grpc-java-b1d72e5c3ecaad3351b95d74657c99e484cd496c.tar.gz
all: Bump protobuf to 3.0.2, to fix protoc in CI
protoc no longer builds in 3.0.0 because auto-download of the gmock zip now fails. 3.0.2 has a fix to autogen: https://github.com/google/protobuf/commit/bba446bbf2ac7b0b9923d4eb07d5acd0665a8cf0 All that was strictly necessary was to update .travis.yml and buildscripts/, but it helps our sanity to keep the rest of the protobuf versions in sync. Lite is left on its existing version, because it did not see a bump of neither the java library nor the protoc plugin.
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 219dd74c4..2e4bf1574 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ language: java
env:
global:
- GRADLE_OPTS=-Xmx512m
- - PROTOBUF_VERSION=3.0.0
+ - PROTOBUF_VERSION=3.0.2
- LDFLAGS=-L/tmp/protobuf/lib
- CXXFLAGS=-I/tmp/protobuf/include
- LD_LIBRARY_PATH=/tmp/protobuf/lib