Skip to content

Commit baeb3f6

Browse files
authored
Merge branch 'release/v1.23' into lunny/upgrade_crypto2
2 parents 579e138 + 8939c38 commit baeb3f6

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

Makefile

+3-4
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,8 @@ unit-test-coverage:
508508
tidy:
509509
$(eval MIN_GO_VERSION := $(shell grep -Eo '^go\s+[0-9]+\.[0-9.]+' go.mod | cut -d' ' -f2))
510510
$(GO) mod tidy -compat=$(MIN_GO_VERSION)
511-
@$(MAKE) --no-print-directory $(GO_LICENSE_FILE)
511+
# disabled because of issues related to https://github.com/google/go-licenses/issues/128
512+
# @$(MAKE) --no-print-directory $(GO_LICENSE_FILE)
512513

513514
vendor: go.mod go.sum
514515
$(GO) mod vendor
@@ -527,9 +528,7 @@ tidy-check: tidy
527528
go-licenses: $(GO_LICENSE_FILE)
528529

529530
$(GO_LICENSE_FILE): go.mod go.sum
530-
@rm -rf $(GO_LICENSE_FILE)
531-
$(GO) install $(GO_LICENSES_PACKAGE)
532-
-GOOS=linux CGO_ENABLED=1 go-licenses save . --force --save_path=$(GO_LICENSE_TMP_DIR) 2>/dev/null
531+
-$(GO) run $(GO_LICENSES_PACKAGE) save . --force --save_path=$(GO_LICENSE_TMP_DIR)
533532
$(GO) run build/generate-go-licenses.go $(GO_LICENSE_TMP_DIR) $(GO_LICENSE_FILE)
534533
@rm -rf $(GO_LICENSE_TMP_DIR)
535534

0 commit comments

Comments
 (0)