File tree Expand file tree Collapse file tree 3 files changed +7
-6
lines changed Expand file tree Collapse file tree 3 files changed +7
-6
lines changed Original file line number Diff line number Diff line change @@ -451,8 +451,7 @@ unit-test-coverage:
451451tidy : # # 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
457456vendor : go.mod go.sum
458457 $(GO ) mod vendor
@@ -471,7 +470,9 @@ tidy-check: tidy
471470go-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+ @rm -rf $(GO_LICENSE_FILE )
474+ $(GO ) install $(GO_LICENSES_PACKAGE )
475+ -GOOS=linux CGO_ENABLED=1 go-licenses save . --force --save_path=$(GO_LICENSE_TMP_DIR ) 2> /dev/null
475476 $(GO ) run build/generate-go-licenses.go $(GO_LICENSE_TMP_DIR ) $(GO_LICENSE_FILE )
476477 @rm -rf $(GO_LICENSE_TMP_DIR )
477478
Original file line number Diff line number Diff line change @@ -24,7 +24,7 @@ require (
2424 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0
2525 github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.6.0
2626 github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358
27- github.com/ProtonMail/go-crypto v1.1.5
27+ github.com/ProtonMail/go-crypto v1.1.6
2828 github.com/PuerkitoBio/goquery v1.10.2
2929 github.com/SaveTheRbtz/zstd-seekable-format-go/pkg v0.7.3
3030 github.com/alecthomas/chroma/v2 v2.15.0
Original file line number Diff line number Diff line change @@ -71,8 +71,8 @@ github.com/Masterminds/sprig/v3 v3.3.0/go.mod h1:Zy1iXRYNqNLUolqCpL4uhk6SHUMAOSC
7171github.com/Microsoft/go-winio v0.5.2 /go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY =
7272github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY =
7373github.com/Microsoft/go-winio v0.6.2 /go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU =
74- github.com/ProtonMail/go-crypto v1.1.5 h1:eoAQfK2dwL+tFSFpr7TbOaPNUbPiJj4fLYwwGE1FQO4 =
75- github.com/ProtonMail/go-crypto v1.1.5 /go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE =
74+ github.com/ProtonMail/go-crypto v1.1.6 h1:ZcV+Ropw6Qn0AX9brlQLAUXfqLBc7Bl+f/DmNxpLfdw =
75+ github.com/ProtonMail/go-crypto v1.1.6 /go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE =
7676github.com/PuerkitoBio/goquery v1.10.2 h1:7fh2BdHcG6VFZsK7toXBT/Bh1z5Wmy8Q9MV9HqT2AM8 =
7777github.com/PuerkitoBio/goquery v1.10.2 /go.mod h1:0guWGjcLu9AYC7C1GHnpysHy056u9aEkUHwhdnePMCU =
7878github.com/RoaringBitmap/roaring v0.4.23 /go.mod h1:D0gp8kJQgE1A4LQ5wFLggQEyvDi06Mq5mKs52e1TwOo =
You can’t perform that action at this time.
0 commit comments