Merge pull request #20146 from hashicorp/make-gen-deps

make: Pull all generate dependencies before generating
This commit is contained in:
Radek Simko 2019-02-01 08:25:49 +00:00 committed by GitHub
commit 70eeec8083
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 6 deletions

View File

@ -72,13 +72,11 @@ cover:
# generate runs `go generate` to build the dynamically generated
# source files, except the protobuf stubs which are built instead with
# "make protobuf".
generate:
@which stringer > /dev/null; if [ $$? -ne 0 ]; then \
GO111MODULE=off go get -u golang.org/x/tools/cmd/stringer; \
fi
generate: tools
# We turn off modules for "go generate" because our downstream generate
# commands are not all ready to deal with Go modules yet, and this
# avoids downloading all of the deps that are in the vendor dir anyway.
# commands are not all ready to deal with Go modules yet.
# See https://github.com/golang/go/issues/24661
# This also avoids downloading all of the deps that are in the vendor dir anyway.
GO111MODULE=off go generate ./...
GO111MODULE=off go fmt command/internal_plugin_list.go > /dev/null