From 5cdb140b317785f5e3d821e49c4bcba3abfbc196 Mon Sep 17 00:00:00 2001 From: dlorenc Date: Tue, 24 May 2016 10:25:09 -0700 Subject: [PATCH] Switch from .gopath to _gopath to be consistent with kubernetes. --- .gitignore | 2 +- Makefile | 2 +- test.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a6e7e9d615..aa17e102b5 100644 --- a/.gitignore +++ b/.gitignore @@ -24,7 +24,7 @@ _testmain.go *.prof /out -/.gopath +/_gopath /pkg/minikube/cluster/localkubecontents.go /minikube diff --git a/Makefile b/Makefile index 19a5b29fde..4a2235e9a6 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ BUILD_DIR ?= ./out ifeq ($(IN_DOCKER),1) GOPATH := /go else - GOPATH := $(shell pwd)/.gopath + GOPATH := $(shell pwd)/_gopath endif REPOPATH ?= k8s.io/minikube diff --git a/test.sh b/test.sh index 60361e4ba7..6157c0362b 100755 --- a/test.sh +++ b/test.sh @@ -22,4 +22,4 @@ TESTS=$(go list -f '{{ if .TestGoFiles }} {{.ImportPath}} {{end}}' ./...) go test -v ${TESTS} # Check gofmt -diff -u <(echo -n) <(gofmt -l -s . | grep -v "vendor\|\.gopath\|localkubecontents.go") +diff -u <(echo -n) <(gofmt -l -s . | grep -v "vendor\|\_gopath\|localkubecontents.go")