Merge branch 'main' into 197_pack_methods_docs

Signed-off-by: dwillist <dthornton@vmware.com>
sabhiram · Aug 12, 2020 · 34bf3ab · 34bf3ab
2 parents 41a28c4 + a94d2e6
commit 34bf3ab
Show file tree

Hide file tree

Showing 4,554 changed files with 3,572 additions and 1,400,001 deletions.
diff --git a/Makefile b/Makefile
@@ -1,13 +1,13 @@
 ACCEPTANCE_TIMEOUT?=$(TEST_TIMEOUT)
 ARCHIVE_NAME=pack-$(PACK_VERSION)
 GOCMD?=go
-GOFLAGS?=-mod=vendor
+GOFLAGS?=
 GOTESTFLAGS?=-v -count=1 -parallel=1
 PACKAGE_BASE=github.com/buildpacks/pack
 PACK_BIN?=pack
 PACK_GITSHA1=$(shell git rev-parse --short=7 HEAD)
 PACK_VERSION?=0.0.0
-SRC=$(shell find . -type f -name '*.go' -not -path "*/vendor/*")
+SRC=$(shell find . -type f -name '*.go' -not -path "*/out/*")
 TEST_TIMEOUT?=900s
 UNIT_TIMEOUT?=$(TEST_TIMEOUT)
 
@@ -31,12 +31,8 @@ all: clean verify test build
 mod-tidy:
 	$(GOCMD) mod tidy
 	cd tools; $(GOCMD) mod tidy
-
-mod-vendor:
-	$(GOCMD) mod vendor
-	cd tools; $(GOCMD) mod vendor
-
-tidy: mod-tidy mod-vendor format
+
+tidy: mod-tidy format
 
 build: out
 	@echo "> Building..."