summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValentin Rothberg <rothberg@redhat.com>2019-02-07 13:20:14 +0100
committerValentin Rothberg <rothberg@redhat.com>2019-02-07 14:25:54 +0100
commit0f0ba530306701cc7443d4a0e514149d8329b75d (patch)
treec5a7f949cc2507e9b41ef696525cdc5ac1467153
parent6d8d1e7eb528aaedd302af0a2a6dc647d15b642f (diff)
downloadpodman-0f0ba530306701cc7443d4a0e514149d8329b75d.tar.gz
podman-0f0ba530306701cc7443d4a0e514149d8329b75d.tar.bz2
podman-0f0ba530306701cc7443d4a0e514149d8329b75d.zip
make vendor: always check for latest vndr
@baude and I have recently debugged a `make vendor` issue, where different versions of `vndr` leave slightly different states behind. This ultimately leads to inconsistencies with the CI, which always fetches the latest version. To avoid such issues in the future, always use the latest version of `vndr` by checking for new versions of it prior to execution. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
-rw-r--r--Makefile11
1 files changed, 6 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index df8549541..2ec7f7a4e 100644
--- a/Makefile
+++ b/Makefile
@@ -289,7 +289,7 @@ uninstall:
install.tools: .install.gitvalidation .install.gometalinter .install.md2man .install.ginkgo ## Install needed tools
.install.vndr: .gopathok
- $(GO) get github.com/LK4D4/vndr
+ $(GO) get -u github.com/LK4D4/vndr
.install.ginkgo: .gopathok
if [ ! -x "$(GOBIN)/ginkgo" ]; then \
@@ -348,10 +348,11 @@ build-all-new-commits:
# Validate that all the commits build on top of $(GIT_BASE_BRANCH)
git rebase $(GIT_BASE_BRANCH) -x make
-vendor:
- vndr -whitelist "github.com/varlink/go" \
- -whitelist "github.com/onsi/ginkgo" \
- -whitelist "github.com/onsi/gomega"
+vendor: .install.vndr
+ $(GOPATH)/bin/vndr \
+ -whitelist "github.com/varlink/go" \
+ -whitelist "github.com/onsi/ginkgo" \
+ -whitelist "github.com/onsi/gomega"
.PHONY: \
.gopathok \