From bb5f694fc57c3ade9c13e841b9a237f4e192da22 Mon Sep 17 00:00:00 2001 From: Antoine GIRARD Date: Tue, 2 May 2017 15:22:21 +0200 Subject: [PATCH] Improve govendor testing (#1623) - Use `govendor list +outside +unused` for finding missing or unused deps and govendor status for catching modified vendor. - Remove appengine import --- Makefile | 10 +++++++++- vendor/vendor.json | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index b0ca71e219..2a6c42430c 100644 --- a/Makefile +++ b/Makefile @@ -21,6 +21,8 @@ SOURCES ?= $(shell find . -name "*.go" -type f) TAGS ?= +TMPDIR := $(shell mktemp -d) + ifneq ($(DRONE_TAG),) VERSION ?= $(subst v,,$(DRONE_TAG)) else @@ -82,7 +84,13 @@ test-vendor: @hash govendor > /dev/null 2>&1; if [ $$? -ne 0 ]; then \ go get -u github.com/kardianos/govendor; \ fi - govendor status +outside +unused || exit 1 + govendor list +unused | tee "$(TMPDIR)/wc-gitea-unused" + [ $$(cat "$(TMPDIR)/wc-gitea-unused" | wc -l) -eq 0 ] || echo "Warning: /!\\ Some vendor are not used /!\\" + + govendor list +outside | tee "$(TMPDIR)/wc-gitea-outside" + [ $$(cat "$(TMPDIR)/wc-gitea-outside" | wc -l) -eq 0 ] || exit 1 + + govendor status || exit 1 .PHONY: test-sqlite test-sqlite: integrations.test diff --git a/vendor/vendor.json b/vendor/vendor.json index 0e8e159351..ea606f02ff 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -1,6 +1,6 @@ { "comment": "", - "ignore": "test", + "ignore": "test appengine", "package": [ { "checksumSHA1": "spqE5xUEPQp8YV67McMTMAUIilY=",