Skip to content

Commit

Permalink
Merge pull request grpc-ecosystem#216 from grpc-ecosystem/feature/upg…
Browse files Browse the repository at this point in the history
…rade-protoc

Use a released version of protoc
  • Loading branch information
yugui committed Aug 16, 2016
2 parents 1f50d11 + ac8622e commit 8d72fd8
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 24 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ cache:
- $HOME/local
- ${TRAVIS_BUILD_DIR}/examples/browser/node_modules
before_install:
- ./.travis/build-protoc.sh 3.0.0-beta-3
- ./.travis/install-protoc.sh 3.0.0
- ./.travis/install-swagger-codegen.sh 2.1.6
- nvm install v6.1 && nvm use v6.1 && node --version
- go get github.com/golang/lint/golint
Expand Down
23 changes: 0 additions & 23 deletions .travis/build-protoc.sh

This file was deleted.

19 changes: 19 additions & 0 deletions .travis/install-protoc.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#!/bin/sh -eu
protoc_version=$1
if test -z "${protoc_version}"; then
echo "Usage: .travis/install-protoc.sh protoc-version"
exit 1
fi
if [ "`$HOME/local/bin/protoc-${protoc_version} --version 2>/dev/null | cut -d' ' -f 2`" != ${protoc_version} ]; then
rm -rf $HOME/local/bin $HOME/local/include

mkdir -p $HOME/tmp $HOME/local
cd $HOME/tmp
wget https://github.com/google/protobuf/releases/download/v${protoc_version}/protoc-${protoc_version}-linux-x86_64.zip
unzip protoc-${protoc_version}-linux-x86_64.zip
mv bin $HOME/local/bin
mv include $HOME/local/include
fi

echo \$ $HOME/local/bin/protoc --version
$HOME/local/bin/protoc --version

0 comments on commit 8d72fd8

Please sign in to comment.