From a6dedd1a12adcdc5a9d38b44c55919a1d3b188a9 Mon Sep 17 00:00:00 2001 From: Daniel Nephin Date: Fri, 2 Feb 2018 10:56:00 -0800 Subject: [PATCH] Fix vendor validation vendor/ must be removed first, otherwise files added to vendor/ but not vendor.conf will not cause the validation to fail Signed-off-by: Daniel Nephin --- Makefile | 3 ++- vendor.conf | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8247a2666f..b56befa303 100644 --- a/Makefile +++ b/Makefile @@ -51,7 +51,8 @@ watch: ## monitor file changes and run go test ./scripts/test/watch vendor: vendor.conf ## check that vendor matches vendor.conf - vndr 2> /dev/null + rm -rf vendor + bash -c 'vndr |& grep -v -i clone' scripts/validate/check-git-diff vendor .PHONY: authors diff --git a/vendor.conf b/vendor.conf index 736f09c92d..afb6439205 100755 --- a/vendor.conf +++ b/vendor.conf @@ -68,6 +68,7 @@ github.com/xeipuuv/gojsonreference e02fc20de94c78484cd5ffb007f8af96be030a45 github.com/xeipuuv/gojsonschema 93e72a773fade158921402d6a24c819b48aba29d golang.org/x/crypto 558b6879de74bc843225cde5686419267ff707ca golang.org/x/net a8b9294777976932365dabb6640cf1468d95c70f +golang.org/x/sync f52d1811a62927559de87708c golang.org/x/sys 95c6576299259db960f6c5b9b69ea52422860fce golang.org/x/text f72d8390a633d5dfb0cc84043294db9f6c935756 golang.org/x/time a4bde12657593d5e90d0533a3e4fd95e635124cb