From ae8fbe704e977e2165eb44f15a184c9bec7668b1 Mon Sep 17 00:00:00 2001 From: Knative Automation Date: Wed, 11 Sep 2024 01:34:46 +0000 Subject: [PATCH] upgrade to latest dependencies bumping knative.dev/hack 06f7aff...fc6a845: > fc6a845 Update community files (# 398) > 9724320 Fix premature codegen cleanup exit on 1 (# 397) Signed-off-by: Knative Automation --- go.mod | 2 +- go.sum | 4 ++-- vendor/knative.dev/hack/codegen-library.sh | 22 ++++++++++++---------- vendor/knative.dev/hack/library.sh | 2 +- vendor/modules.txt | 2 +- 5 files changed, 17 insertions(+), 15 deletions(-) diff --git a/go.mod b/go.mod index 007ad7c77e2..2cdba73b04e 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,7 @@ require ( google.golang.org/grpc v1.56.3 gopkg.in/go-playground/webhooks.v3 v3.13.0 gopkg.in/yaml.v2 v2.3.0 - knative.dev/hack v0.0.0-20240814130635-06f7aff93954 + knative.dev/hack v0.0.0-20240909014011-fc6a8452af6d ) require ( diff --git a/go.sum b/go.sum index 27a2e985bcf..aee3870e548 100644 --- a/go.sum +++ b/go.sum @@ -241,5 +241,5 @@ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= 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-20240814130635-06f7aff93954 h1:dGMK5VoL75szvrYQTL9NqhPYHu1f5dGaXx1hJI8fAFM= -knative.dev/hack v0.0.0-20240814130635-06f7aff93954/go.mod h1:R0ritgYtjLDO9527h5vb5X6gfvt5LCrJ55BNbVDsWiY= +knative.dev/hack v0.0.0-20240909014011-fc6a8452af6d h1:mgROhGJG3+g0SBkaG4Y2HxrIOLN3ZZcN4+IFZla+Zqs= +knative.dev/hack v0.0.0-20240909014011-fc6a8452af6d/go.mod h1:R0ritgYtjLDO9527h5vb5X6gfvt5LCrJ55BNbVDsWiY= diff --git a/vendor/knative.dev/hack/codegen-library.sh b/vendor/knative.dev/hack/codegen-library.sh index 01a43132dc6..42ece681cea 100644 --- a/vendor/knative.dev/hack/codegen-library.sh +++ b/vendor/knative.dev/hack/codegen-library.sh @@ -133,16 +133,18 @@ function restore-changes-if-its-copyright-year-only() { local difflist log "Cleaning up generated code" difflist="$(mktemp)" - git diff --exit-code --name-only > "$difflist" - # list git changes and skip those which differ only in the boilerplate year - while read -r file; do - # check if the file contains just the change in the boilerplate year - if [ "$(LANG=C git diff --exit-code --shortstat -- "$file")" = ' 1 file changed, 1 insertion(+), 1 deletion(-)' ] && \ - [[ "$(git diff --exit-code -U1 -- "$file" | grep -Ec '^[+-]\s*[*#]?\s*Copyright 2[0-9]{3}')" -eq 2 ]]; then - # restore changes to that file - git checkout -- "$file" - fi - done < "$difflist" + if ! git diff --exit-code --name-only > /dev/null; then + # list git changes and skip those which differ only in the boilerplate year + git diff --name-only > "$difflist" + while read -r file; do + # check if the file contains just the change in the boilerplate year + if [ "$(LANG=C git diff --exit-code --shortstat -- "$file")" = ' 1 file changed, 1 insertion(+), 1 deletion(-)' ] && \ + [[ "$(git diff --exit-code -U1 -- "$file" | grep -Ec '^[+-]\s*[*#]?\s*Copyright 2[0-9]{3}')" -eq 2 ]]; then + # restore changes to that file + git checkout -- "$file" + fi + done < "$difflist" + fi rm -f "$difflist" } diff --git a/vendor/knative.dev/hack/library.sh b/vendor/knative.dev/hack/library.sh index 08f2dba16f1..d487a14957e 100644 --- a/vendor/knative.dev/hack/library.sh +++ b/vendor/knative.dev/hack/library.sh @@ -774,7 +774,7 @@ function go_update_deps() { function __clean_goworksum_if_exists() { if [ -f "$REPO_ROOT_DIR/go.work.sum" ]; then log.step 'Cleaning the go.work.sum file' - truncate --size 0 "$REPO_ROOT_DIR/go.work.sum" + truncate -s 0 "$REPO_ROOT_DIR/go.work.sum" fi } diff --git a/vendor/modules.txt b/vendor/modules.txt index c6adbe23110..2b4fdd45dc1 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -318,7 +318,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-20240814130635-06f7aff93954 +# knative.dev/hack v0.0.0-20240909014011-fc6a8452af6d ## explicit; go 1.21 knative.dev/hack # go.opencensus.io => go.opencensus.io v0.20.2