From 3a0c1b0230e1c605e0fada6031ebd83f0c32bc25 Mon Sep 17 00:00:00 2001 From: Dan Lorenc Date: Fri, 13 May 2016 10:24:39 -0700 Subject: [PATCH] Add .gopath and generated code to the whitelist for gofmt. --- Makefile | 2 +- test.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 88fbf46288..bf4dd5c1dd 100644 --- a/Makefile +++ b/Makefile @@ -32,7 +32,7 @@ out/minikube: out/minikube-$(GOOS)-$(GOARCH) out/localkube: .gopath ifeq ($(GOOS),linux) - CGO_ENABLED=1 go build -v -ldflags="-s" -o $(BUILD_DIR)/localkube ./cmd/localkube + CGO_ENABLED=1 go build -ldflags="-s" -o $(BUILD_DIR)/localkube ./cmd/localkube else docker run -w /go/src/k8s.io/minikube -e GOPATH=/go -v $(shell pwd):/go/src/k8s.io/minikube golang:1.6 make out/localkube endif diff --git a/test.sh b/test.sh index e1d4657b4d..098ea2f346 100755 --- a/test.sh +++ b/test.sh @@ -22,4 +22,4 @@ for TEST in $(find -name "*.go" | grep -v vendor | grep -v integration | grep _t done # Check gofmt -diff -u <(echo -n) <(gofmt -l -s . | grep -v vendor) +diff -u <(echo -n) <(gofmt -l -s . | grep -v "vendor\|\.gopath\|localkubecontents.go")