Skip to content

Commit 32b4b86

Browse files
committed
revert and fix go-licenses
1 parent deb3df5 commit 32b4b86

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -451,8 +451,7 @@ unit-test-coverage:
451451
tidy: ## run go mod tidy
452452
$(eval MIN_GO_VERSION := $(shell grep -Eo '^go\s+[0-9]+\.[0-9.]+' go.mod | cut -d' ' -f2))
453453
$(GO) mod tidy -compat=$(MIN_GO_VERSION)
454-
# disabled because of issues related to https://github.com/google/go-licenses/issues/128
455-
# @$(MAKE) --no-print-directory $(GO_LICENSE_FILE)
454+
@$(MAKE) --no-print-directory $(GO_LICENSE_FILE)
456455

457456
vendor: go.mod go.sum
458457
$(GO) mod vendor
@@ -471,7 +470,8 @@ tidy-check: tidy
471470
go-licenses: $(GO_LICENSE_FILE) ## regenerate go licenses
472471

473472
$(GO_LICENSE_FILE): go.mod go.sum
474-
-$(GO) run $(GO_LICENSES_PACKAGE) save . --force --save_path=$(GO_LICENSE_TMP_DIR)
473+
$(GO) install $(GO_LICENSES_PACKAGE)
474+
-GOOS=linux CGO_ENABLED=1 go-licenses save . --force --save_path=$(GO_LICENSE_TMP_DIR) 2>/dev/null
475475
$(GO) run build/generate-go-licenses.go $(GO_LICENSE_TMP_DIR) $(GO_LICENSE_FILE)
476476
@rm -rf $(GO_LICENSE_TMP_DIR)
477477

0 commit comments

Comments
 (0)