Merge branch 'migrate-to-dep'

heroku · Oct 3, 2018 · 567645a · 567645a
2 parents fd2fe80 + 3e2ab44
commit 567645a
Show file tree

Hide file tree

Showing 65 changed files with 64 additions and 7,062 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/Godeps/Readme b/Godeps/Readme
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -0,0 +1,4 @@
+[prune]
+  go-tests = true
+  non-go = true
+  unused-packages = true
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-GO_FILES := $(shell find . -type f -name '*.go' -not -path "./Godeps/*" -not -path "./vendor/*")
+GO_FILES := $(shell find . -type f -name '*.go' -not -path "./vendor/*")
 GO_PACKAGES := $(shell go list ./... | sed "s/github.com\/heroku\/docker-registry-client/./" | grep -v "^./vendor/")
 
 build:
@@ -18,7 +18,6 @@ hooks:
 	ln -fs ../../bin/git-pre-commit.sh .git/hooks/pre-commit
 
 tidy: goimports
-	./bin/go-version-sync-check.sh
 	test -z "$$(goimports -l -d $(GO_FILES) | tee /dev/stderr)"
 	go vet $(GO_PACKAGES)
 

diff --git a/bin/go-version-sync-check.sh b/bin/go-version-sync-check.sh
diff --git a/vendor/github.com/docker/distribution/.gitignore b/vendor/github.com/docker/distribution/.gitignore
diff --git a/vendor/github.com/docker/distribution/.mailmap b/vendor/github.com/docker/distribution/.mailmap
diff --git a/vendor/github.com/docker/distribution/BUILDING.md b/vendor/github.com/docker/distribution/BUILDING.md