Merge pull request #2401 from monopole/fixBuild

Fix broken Makefiles.

cmd/kubectl/Makefile

@@ -5,7 +5,7 @@
 
 GOBIN := $(shell go env GOPATH)/bin
 
-all: generate license fix vet fmt test lint tidy
+all: generate license fix vet fmt test tidy
 
 fix:
 	go fix ./...
@@ -33,4 +33,3 @@ test:
 
 vet:
 	go vet ./...
-

functions/examples/application-cr/Makefile

@@ -21,8 +21,8 @@ generate:
 	(cd image && GOBIN=$(GOBIN) go generate ./...)
 
 license:
-	(which $(GOPATH)/bin/addlicense || go get github.com/google/addlicense)
-	$(GOPATH)/bin/addlicense  -y 2019 -c "The Kubernetes Authors." -f LICENSE_TEMPLATE .
+	(which $(GOBIN)/addlicense || go get github.com/google/addlicense)
+	$(GOBIN)/addlicense  -y 2019 -c "The Kubernetes Authors." -f LICENSE_TEMPLATE .
 
 tidy:
 	(cd image && go mod tidy)

functions/examples/injection-tshirt-sizes/Makefile

@@ -21,8 +21,8 @@ generate:
 	(cd image && GOBIN=$(GOBIN) go generate ./...)
 
 license:
-	(which $(GOPATH)/bin/addlicense || go get github.com/google/addlicense)
-	$(GOPATH)/bin/addlicense  -y 2019 -c "The Kubernetes Authors." -f LICENSE_TEMPLATE .
+	(which $(GOBIN)/addlicense || go get github.com/google/addlicense)
+	$(GOBIN)/addlicense  -y 2019 -c "The Kubernetes Authors." -f LICENSE_TEMPLATE .
 
 tidy:
 	(cd image && go mod tidy)

functions/examples/template-go-nginx/Makefile

@@ -21,8 +21,8 @@ generate:
 	(cd image && GOBIN=$(GOBIN) go generate ./...)
 
 license:
-	(which $(GOPATH)/bin/addlicense || go get github.com/google/addlicense)
-	$(GOPATH)/bin/addlicense  -y 2019 -c "The Kubernetes Authors." -f LICENSE_TEMPLATE .
+	(which $(GOBIN)/addlicense || go get github.com/google/addlicense)
+	$(GOBIN)/addlicense  -y 2019 -c "The Kubernetes Authors." -f LICENSE_TEMPLATE .
 
 tidy:
 	(cd image && go mod tidy)

functions/examples/template-heredoc-cockroachdb/Makefile

@@ -3,9 +3,11 @@
 
 .PHONY: license image
 
+GOBIN := $(shell go env GOPATH)/bin
+
 license:
-	(which $(GOPATH)/bin/addlicense || go get github.com/google/addlicense)
-	$(GOPATH)/bin/addlicense  -y 2019 -c "The Kubernetes Authors." -f LICENSE_TEMPLATE .
+	(which $(GOBIN)/addlicense || go get github.com/google/addlicense)
+	$(GOBIN)/addlicense  -y 2019 -c "The Kubernetes Authors." -f LICENSE_TEMPLATE .
 
 all: license
 

functions/examples/validator-kubeval/Makefile

@@ -21,8 +21,8 @@ generate:
 	(cd image && GOBIN=$(GOBIN) go generate ./...)
 
 license:
-	(which $(GOPATH)/bin/addlicense || go get github.com/google/addlicense)
-	$(GOPATH)/bin/addlicense  -y 2019 -c "The Kubernetes Authors." -f LICENSE_TEMPLATE .
+	(which $(GOBIN)/addlicense || go get github.com/google/addlicense)
+	$(GOBIN)/addlicense  -y 2019 -c "The Kubernetes Authors." -f LICENSE_TEMPLATE .
 
 tidy:
 	(cd image && go mod tidy)

functions/examples/validator-resource-requests/Makefile

@@ -21,8 +21,8 @@ generate:
 	(cd image && GOBIN=$(GOBIN) go generate ./...)
 
 license:
-	(which $(GOPATH)/bin/addlicense || go get github.com/google/addlicense)
-	$(GOPATH)/bin/addlicense  -y 2019 -c "The Kubernetes Authors." -f LICENSE_TEMPLATE .
+	(which $(GOBIN)/addlicense || go get github.com/google/addlicense)
+	$(GOBIN)/addlicense  -y 2019 -c "The Kubernetes Authors." -f LICENSE_TEMPLATE .
 
 tidy:
 	(cd image && go mod tidy)

travis/kyaml-pre-commit.sh

@@ -5,8 +5,21 @@
 set -e
 
 # run all tests for kyaml and related commands
-targets="kyaml cmd/config cmd/kubectl functions/examples/injection-tshirt-sizes functions/examples/template-go-nginx functions/examples/template-heredoc-cockroachdb functions/examples/validator-kubeval functions/examples/validator-resource-requests functions/examples/application-cr"
+
+targets="
+kyaml
+cmd/config
+cmd/kubectl
+functions/examples/injection-tshirt-sizes
+functions/examples/template-go-nginx
+functions/examples/template-heredoc-cockroachdb
+functions/examples/validator-kubeval
+functions/examples/validator-resource-requests
+functions/examples/application-cr
+"
+
 for target in $targets; do
+  echo "----- Making $target -----"
   pushd .
   cd $target
   make all