diff options
| author | zpencer <spencerfang@google.com> | 2018-04-27 15:59:16 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-27 15:59:16 -0700 |
| commit | 1d80febbc0090e7333717b79daaeb28cc3160255 (patch) | |
| tree | fe313157f1a93af94b75038baa274185b62df656 /.travis.yml | |
| parent | 6046831e580349d85a5e17f4bf793eb103f757b2 (diff) | |
| download | grpc-grpc-java-1d80febbc0090e7333717b79daaeb28cc3160255.tar.gz | |
buildscripts: make unix.sh and make_dependencies.sh arch aware (#4384)
ARCH can be '32' or '64'. If it is not set then default to '64'.
make_dependencies.sh should do the symlinking
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 7ea9aee3d..9ed002356 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,8 +17,7 @@ before_install: ln -s /tmp/gradle-wrapper $HOME/.gradle/wrapper # Work around https://github.com/travis-ci/travis-ci/issues/2317 - if \[ "$TRAVIS_OS_NAME" = linux \]; then jdk_switcher use oraclejdk8; fi - - buildscripts/make_dependencies.sh # build protoc into /tmp/protobuf-${PROTOBUF_VERSION} - - ln -s "/tmp/protobuf-${PROTOBUF_VERSION}/$(uname -s)-$(uname -p)" /tmp/protobuf + - buildscripts/make_dependencies.sh # build protoc into /tmp/protobuf - mkdir -p $HOME/.gradle - echo "checkstyle.ignoreFailures=false" >> $HOME/.gradle/gradle.properties - echo "failOnWarnings=true" >> $HOME/.gradle/gradle.properties |