From edf79d6e8b41099d5d0f98549d8ddc3f35f3c20e Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Wed, 12 Feb 2025 10:47:30 +0100 Subject: [PATCH] [no-relnote] Update vendor make target to handle submodules Signed-off-by: Evan Lezar --- Makefile | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index be9da4bc..1b9f921e 100644 --- a/Makefile +++ b/Makefile @@ -90,10 +90,29 @@ goimports: lint: golangci-lint run ./... -vendor: - go mod tidy - go mod vendor - go mod verify +vendor: | mod-tidy mod-vendor mod-verify + +mod-tidy: + @for mod in $$(find . -name go.mod -not -path "./testdata/*" -not -path "./third_party/*"); do \ + echo "Tidying $$mod..."; ( \ + cd $$(dirname $$mod) && go mod tidy \ + ) || exit 1; \ + done + +mod-vendor: + @for mod in $$(find . -name go.mod -not -path "./testdata/*" -not -path "./third_party/*" -not -path "./deployments/*"); do \ + echo "Vendoring $$mod..."; ( \ + cd $$(dirname $$mod) && go mod vendor \ + ) || exit 1; \ + done + +mod-verify: + @for mod in $$(find . -name go.mod -not -path "./testdata/*" -not -path "./third_party/*"); do \ + echo "Verifying $$mod..."; ( \ + cd $$(dirname $$mod) && go mod verify | sed 's/^/ /g' \ + ) || exit 1; \ + done + check-vendor: vendor git diff --quiet HEAD -- go.mod go.sum vendor