This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

Makefile: Ignore vendor folder in subdirectories

Before, NOVENDOR only excluded the vendor directory in the root
directory. However, sometimes integration tests have their own vendor
folder.
  • Loading branch information...
kklin committed Nov 20, 2017
1 parent 4e70c72 commit b0c6b2a7c1a8042163a4e095b738e5e378424ffc
Showing with 2 additions and 3 deletions.
  1. +2 −3 Makefile
View
@@ -1,14 +1,13 @@
export GO15VENDOREXPERIMENT=1
PACKAGES=$(shell govendor list -no-status +local)
NOVENDOR=$(shell find . -path -prune -o -path ./vendor -prune -o -name '*.go' -print)
NOVENDOR=$(shell find . -path -prune -o -path '*/vendor' -prune -o -name '*.go' -print)
LINE_LENGTH_EXCLUDE=./api/pb/pb.pb.go \
./cloud/amazon/client/mocks/% \
./cloud/cfg/template.go \
./cloud/digitalocean/client/mocks/% \
./cloud/google/client/mocks/% \
./cloud/machine/amazon.go \
./cloud/machine/google.go \
./integration-tester/tests/zookeeper/vendor/% \
./minion/network/link_test.go \
./minion/ovsdb/mock_transact_test.go \
./minion/ovsdb/mocks/Client.go \
@@ -109,7 +108,7 @@ check-blueprints: build-blueprints-tester
lint: golint jslint misspell
misspell:
find . \( -path ./vendor -or -path '*/node_modules/*' -or -path ./docs/build \) -prune -or -name '*' -type f -print | xargs misspell -error
find . \( -path '*/vendor' -or -path '*/node_modules/*' -or -path ./docs/build \) -prune -or -name '*' -type f -print | xargs misspell -error
jslint:
$(JS_LINT_COMMAND)

0 comments on commit b0c6b2a

Please sign in to comment.