From 37835d64443fe19368bd0dde930efa516d75fa1f Mon Sep 17 00:00:00 2001 From: Seth Hoenig Date: Wed, 3 Jun 2020 09:35:09 -0500 Subject: [PATCH] deps: remove tidy from dev makefile target With Go modules, `go mod tidy` supplants `vendorfmt`. Unfortunately, `tidy` will try to reach out to the network and download modules, and there is no way to disable that behavior (e.g. the -mod=vendor) option does not apply. This means we cannot use the `tidy` target in nomad enterprise, which will be unable to reach private repositories like consul-enterprise. This isn't a big deal, since `vendorfmt` served the purpose of rewriting the output of `govendor`, wheras `tidy` is a part of the `sync` target that is required to be run when modifying dependencies anyway. --- GNUmakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GNUmakefile b/GNUmakefile index 0fd15f886..25624ee96 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -268,7 +268,7 @@ dev: GOOS=$(shell go env GOOS) dev: GOARCH=$(shell go env GOARCH) dev: GOPATH=$(shell go env GOPATH) dev: DEV_TARGET=pkg/$(GOOS)_$(GOARCH)/nomad -dev: tidy changelogfmt hclfmt ## Build for the current development platform +dev: changelogfmt hclfmt ## Build for the current development platform @echo "==> Removing old development build..." @rm -f $(PROJECT_ROOT)/$(DEV_TARGET) @rm -f $(PROJECT_ROOT)/bin/nomad