From c2c1e6c6aa81cbfad40373e10b5287e7e8ec5517 Mon Sep 17 00:00:00 2001 From: Knative Automation Date: Wed, 27 Mar 2024 15:35:59 +0000 Subject: [PATCH 1/2] upgrade to latest dependencies bumping knative.dev/hack 7e71024...47368d6: > 47368d6 Check licenses only, but not bundle them (# 376) > b985a5b Update community files (# 377) Signed-off-by: Knative Automation --- go.mod | 2 +- go.sum | 4 ++-- vendor/knative.dev/hack/library.sh | 16 ++-------------- vendor/modules.txt | 2 +- 4 files changed, 6 insertions(+), 18 deletions(-) diff --git a/go.mod b/go.mod index 999bd4acd0..210f7446ac 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,7 @@ require ( google.golang.org/grpc v1.36.0 gopkg.in/go-playground/webhooks.v3 v3.13.0 gopkg.in/yaml.v2 v2.3.0 - knative.dev/hack v0.0.0-20240327124551-7e71024d29bd + knative.dev/hack v0.0.0-20240327150553-47368d631660 ) require ( diff --git a/go.sum b/go.sum index 1c877ce268..f1b23bb531 100644 --- a/go.sum +++ b/go.sum @@ -519,8 +519,8 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.5 h1:nI5egYTGJakVyOryqLs1cQO5dO0ksin5XXs2pspk75k= honnef.co/go/tools v0.0.1-2020.1.5/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -knative.dev/hack v0.0.0-20240327124551-7e71024d29bd h1:tSFFAPYhN5d39ze+orScRvg43V85GaaSkUiDdLqZZ3I= -knative.dev/hack v0.0.0-20240327124551-7e71024d29bd/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q= +knative.dev/hack v0.0.0-20240327150553-47368d631660 h1:tW6NgyjMnSXBS75+k+Xh5uNiLhJ9TFswS9hrkC3OQOc= +knative.dev/hack v0.0.0-20240327150553-47368d631660/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= diff --git a/vendor/knative.dev/hack/library.sh b/vendor/knative.dev/hack/library.sh index 6f6a24c8eb..e5d21b70e6 100644 --- a/vendor/knative.dev/hack/library.sh +++ b/vendor/knative.dev/hack/library.sh @@ -772,8 +772,8 @@ function __go_update_deps_for_module() { remove_broken_symlinks ./vendor fi - group "Updating licenses" - update_licenses third_party/VENDOR-LICENSE "./..." + group "Checking licenses" + check_licenses ) } @@ -809,18 +809,6 @@ function run_kntest() { go_run knative.dev/test-infra/tools/kntest/cmd/kntest@latest "$@" } -# Run go-licenses to update licenses. -# Parameters: $1 - output file, relative to repo root dir. -# $2 - directory to inspect. -function update_licenses() { - local dst=$1 - local dir=$2 - shift - go_run github.com/google/go-licenses@v1.6.0 \ - save "${dir}" --save_path="${dst}" --force || \ - { echo "--- FAIL: go-licenses failed to update licenses"; return 1; } -} - # Run go-licenses to check for forbidden licenses. function check_licenses() { # Check that we don't have any forbidden licenses. diff --git a/vendor/modules.txt b/vendor/modules.txt index a09c6e4344..9df33015c2 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -300,7 +300,7 @@ gopkg.in/go-playground/webhooks.v3/github gopkg.in/yaml.v2 # honnef.co/go/tools v0.0.1-2020.1.5 ## explicit; go 1.11 -# knative.dev/hack v0.0.0-20240327124551-7e71024d29bd +# knative.dev/hack v0.0.0-20240327150553-47368d631660 ## explicit; go 1.18 knative.dev/hack # go.opencensus.io => go.opencensus.io v0.20.2 From 6d3ffaf1638fbbe8c05c54acef06dfab425b1e6e Mon Sep 17 00:00:00 2001 From: Reto Lehmann Date: Tue, 2 Apr 2024 09:01:37 +0200 Subject: [PATCH 2/2] Fix unit-tests --- code-samples/serving/hello-world/helloworld-nodejs/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code-samples/serving/hello-world/helloworld-nodejs/README.md b/code-samples/serving/hello-world/helloworld-nodejs/README.md index 3eb723122c..a76e271dd0 100644 --- a/code-samples/serving/hello-world/helloworld-nodejs/README.md +++ b/code-samples/serving/hello-world/helloworld-nodejs/README.md @@ -78,7 +78,7 @@ cd knative-docs/code-samples/serving/hello-world/helloworld-nodejs "author": "", "license": "Apache-2.0", "dependencies": { - "express": "^4.18.2" + "express": "^4.19.2" } } ```