From d55ba78b65b3ed8681a7100d5e9b1269f2deb269 Mon Sep 17 00:00:00 2001 From: silverwind Date: Fri, 28 Feb 2025 06:23:51 +0100 Subject: [PATCH 1/2] Disable go license generation as part of `make tidy` --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e38fb801c318a..3197a71392d13 100644 --- a/Makefile +++ b/Makefile @@ -451,7 +451,8 @@ unit-test-coverage: tidy: ## run go mod tidy $(eval MIN_GO_VERSION := $(shell grep -Eo '^go\s+[0-9]+\.[0-9.]+' go.mod | cut -d' ' -f2)) $(GO) mod tidy -compat=$(MIN_GO_VERSION) - @$(MAKE) --no-print-directory $(GO_LICENSE_FILE) +# disabled because of issues related to https://github.com/google/go-licenses/issues/128 +# @$(MAKE) --no-print-directory $(GO_LICENSE_FILE) vendor: go.mod go.sum $(GO) mod vendor From 52649cb763af8d9aa3d4d143ecf09e3ae990cfea Mon Sep 17 00:00:00 2001 From: silverwind Date: Fri, 28 Feb 2025 06:27:59 +0100 Subject: [PATCH 2/2] show stderr --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3197a71392d13..38ec34545c208 100644 --- a/Makefile +++ b/Makefile @@ -471,7 +471,7 @@ tidy-check: tidy go-licenses: $(GO_LICENSE_FILE) ## regenerate go licenses $(GO_LICENSE_FILE): go.mod go.sum - -$(GO) run $(GO_LICENSES_PACKAGE) save . --force --save_path=$(GO_LICENSE_TMP_DIR) 2>/dev/null + -$(GO) run $(GO_LICENSES_PACKAGE) save . --force --save_path=$(GO_LICENSE_TMP_DIR) $(GO) run build/generate-go-licenses.go $(GO_LICENSE_TMP_DIR) $(GO_LICENSE_FILE) @rm -rf $(GO_LICENSE_TMP_DIR)