Merge pull request #348 from quorumcontrol/add/generated-prereq-to-vendor-target

Add generated pre-req to vendor make target

Author: Wes Morgan

.circleci/config.yml

@@ -2,7 +2,7 @@ version: 2
 jobs:
   build:
     docker:
-      - image: circleci/golang:1.12.6
+      - image: circleci/golang:1.13.1
     environment:
       SOURCE_MOUNT: --volumes-from=source
     steps:
@@ -11,6 +11,9 @@ jobs:
       - add_ssh_keys:
           fingerprints:
             - "06:4a:76:ba:0c:08:2f:ee:d6:2c:0f:7f:fa:f0:28:45"
+      - run: |
+          sudo apt-get update
+          sudo apt-get install -y protobuf-compiler
       - restore_cache:
           keys:
             - go-mod-v1-{{ checksum "go.sum" }}

Makefile

@@ -48,7 +48,7 @@ $(generated): rpcserver/tupelo.proto rpcserver/nodestore/nodestore.proto rpcserv
 	cd rpcserver && protoc -I=. -I=${FIRSTGOPATH}/src/github.com/gogo/protobuf/protobuf --gogofaster_out=Mgoogle/protobuf/any.proto=github.com/gogo/protobuf/types,paths=source_relative,plugins=grpc:. nodestore/*.proto
 	cd rpcserver && protoc -I=. -I=${FIRSTGOPATH}/src/github.com/gogo/protobuf/protobuf --gogofaster_out=Mgoogle/protobuf/any.proto=github.com/gogo/protobuf/types,paths=source_relative,plugins=grpc:. nodestore/badger/*.proto
 
-vendor: go.mod go.sum $(FIRSTGOPATH)/bin/modvendor
+vendor: go.mod go.sum $(FIRSTGOPATH)/bin/modvendor $(generated)
 	go mod vendor
 	modvendor -copy="**/*.c **/*.h"
 

go.mod

@@ -47,7 +47,6 @@ require (
 	go.uber.org/zap v1.10.0
 	golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392
 	golang.org/x/net v0.0.0-20190620200207-3b0461eec859
-	google.golang.org/appengine v1.4.0 // indirect
 	google.golang.org/genproto v0.0.0-20190611190212-a7e196e89fd3 // indirect
 	google.golang.org/grpc v1.21.1
 )