diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-02-06 13:42:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-06 13:42:47 +0100 |
| commit | d321c5d942f85b56852532edfd225dcdd591f817 (patch) | |
| tree | 30ad98bcc2c2dd1136f46a48cbc44d422adfa184 /Makefile | |
| parent | 314e1a9c5a2041d2263bb74f1d21aa2798154d76 (diff) | |
| parent | 9ac0ebb0791851aea81ecc847802db5a39bfb6e7 (diff) | |
| download | podman-d321c5d942f85b56852532edfd225dcdd591f817.tar.gz podman-d321c5d942f85b56852532edfd225dcdd591f817.tar.bz2 podman-d321c5d942f85b56852532edfd225dcdd591f817.zip | |
Merge pull request #2259 from vrothberg/vendor-check
Vendor check
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 12 |
1 files changed, 7 insertions, 5 deletions
@@ -274,14 +274,14 @@ uninstall: .PHONY: install.tools -install.tools: .install.gitvalidation .install.gometalinter .install.md2man .install.ginkgo .install.gomega +install.tools: .install.gitvalidation .install.gometalinter .install.md2man .install.ginkgo -.install.gomega: .gopathok - $(GO) get github.com/onsi/gomega/... +.install.vndr: .gopathok + $(GO) get github.com/LK4D4/vndr .install.ginkgo: .gopathok if [ ! -x "$(GOBIN)/ginkgo" ]; then \ - $(GO) get -u github.com/onsi/ginkgo/ginkgo; \ + $(GO) build -o ${GOPATH}/bin/ginkgo ./vendor/github.com/onsi/ginkgo/ginkgo ; \ fi .install.gitvalidation: .gopathok @@ -337,7 +337,9 @@ build-all-new-commits: git rebase $(GIT_BASE_BRANCH) -x make vendor: - vndr -whitelist "github.com/varlink/go" + vndr -whitelist "github.com/varlink/go" \ + -whitelist "github.com/onsi/ginkgo" \ + -whitelist "github.com/onsi/gomega" .PHONY: \ .gopathok \ |