*: pin protoc-gen-go dependencies

This commit is contained in:
Eric Chiang 2017-11-30 16:40:42 -08:00
parent 861d4ae447
commit 35063da41e
4 changed files with 17 additions and 6 deletions

View File

@ -25,6 +25,7 @@ install:
script: script:
- make testall - make testall
- ./scripts/test-k8s.sh - ./scripts/test-k8s.sh
- make verify-proto # Ensure proto generation doesn't depend on external packages.
notifications: notifications:
email: false email: false

View File

@ -61,14 +61,14 @@ docker-image:
@sudo docker build -t $(DOCKER_IMAGE) . @sudo docker build -t $(DOCKER_IMAGE) .
.PHONY: proto .PHONY: proto
proto: api/api.pb.go server/internal/types.pb.go proto: bin/protoc bin/protoc-gen-go
api/api.pb.go: api/api.proto bin/protoc bin/protoc-gen-go
@./bin/protoc --go_out=plugins=grpc:. --plugin=protoc-gen-go=./bin/protoc-gen-go api/*.proto @./bin/protoc --go_out=plugins=grpc:. --plugin=protoc-gen-go=./bin/protoc-gen-go api/*.proto
server/internal/types.pb.go: server/internal/types.proto bin/protoc bin/protoc-gen-go
@./bin/protoc --go_out=. --plugin=protoc-gen-go=./bin/protoc-gen-go server/internal/*.proto @./bin/protoc --go_out=. --plugin=protoc-gen-go=./bin/protoc-gen-go server/internal/*.proto
.PHONY: verify-proto
verify-proto: proto
@./scripts/git-diff
bin/protoc: scripts/get-protoc bin/protoc: scripts/get-protoc
@./scripts/get-protoc bin/protoc @./scripts/get-protoc bin/protoc

View File

@ -128,11 +128,14 @@ import:
- peer - peer
- transport - transport
- package: github.com/golang/protobuf - package: github.com/golang/protobuf
version: 2bba0603135d7d7f5cb73b2125beeda19c09f4ef version: 1e59b77b52bf8e4b449a57e6f79f21226d571845
subpackages: subpackages:
- proto - proto
- protoc-gen-go - protoc-gen-go
- protoc-gen-go/grpc - protoc-gen-go/grpc
- protoc-gen-go/descriptor
- protoc-gen-go/plugin
- protoc-gen-go/generator
- package: google.golang.org/genproto - package: google.golang.org/genproto
version: 411e09b969b1170a9f0c467558eb4c4c110d9c77 version: 411e09b969b1170a9f0c467558eb4c4c110d9c77

7
scripts/git-diff Executable file
View File

@ -0,0 +1,7 @@
#!/bin/bash -e
DIFF=$( git diff . )
if [ "$DIFF" != "" ]; then
echo "$DIFF" >&2
exit 1
fi