From 17848a1868b2d281c9be3921f3f67ce5fae9c63a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miloslav=20Trma=C4=8D?= Date: Wed, 8 Apr 2020 16:42:50 +0200 Subject: [PATCH] Run (go mod tidy) before (go mod vendor) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is conceptually consistent: First change the set of dependencies, then update the vendored copy. (Due to (go mod verify) afterwards, and CI running this again, this should not make a difference in practice, so this is just a clean-up.) Signed-off-by: Miloslav Trmač --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b16b2c3c..aa09bccc 100644 --- a/Makefile +++ b/Makefile @@ -184,8 +184,8 @@ test-unit-local: $(GPGME_ENV) $(GO) test $(MOD_VENDOR) -tags "$(BUILDTAGS)" $$($(GO) list $(MOD_VENDOR) -tags "$(BUILDTAGS)" -e ./... | grep -v '^github\.com/containers/skopeo/\(integration\|vendor/.*\)$$') vendor: - $(GO) mod vendor $(GO) mod tidy + $(GO) mod vendor $(GO) mod verify vendor-in-container: