From 28aa81b9e2c5becc90bf67b1e7110abfe3f6f443 Mon Sep 17 00:00:00 2001 From: Knative Automation Date: Thu, 5 Sep 2024 13:11:39 +0000 Subject: [PATCH] upgrade to latest dependencies bumping knative.dev/hack 06f7aff...9724320: > 9724320 Fix premature codegen cleanup exit on 1 (# 397) bumping knative.dev/hack/schema 06f7aff...9724320: > 9724320 Fix premature codegen cleanup exit on 1 (# 397) bumping knative.dev/pkg 89743d9...a1469cf: > a1469cf upgrade to latest dependencies (# 3088) Signed-off-by: Knative Automation --- go.mod | 6 +++--- go.sum | 12 ++++++------ vendor/knative.dev/hack/codegen-library.sh | 22 ++++++++++++---------- vendor/knative.dev/hack/library.sh | 2 +- vendor/modules.txt | 6 +++--- 5 files changed, 25 insertions(+), 23 deletions(-) diff --git a/go.mod b/go.mod index c46eb54883d..2e5e97fbf7a 100644 --- a/go.mod +++ b/go.mod @@ -43,9 +43,9 @@ require ( k8s.io/apiserver v0.30.3 k8s.io/client-go v0.30.3 k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 - knative.dev/hack v0.0.0-20240814130635-06f7aff93954 - knative.dev/hack/schema v0.0.0-20240814130635-06f7aff93954 - knative.dev/pkg v0.0.0-20240815051656-89743d9bbf7c + knative.dev/hack v0.0.0-20240904112633-9724320e463f + knative.dev/hack/schema v0.0.0-20240904112633-9724320e463f + knative.dev/pkg v0.0.0-20240905103434-a1469cf54480 knative.dev/reconciler-test v0.0.0-20240820100420-036ce14b8617 sigs.k8s.io/yaml v1.4.0 ) diff --git a/go.sum b/go.sum index 2b29df18788..ba47c218282 100644 --- a/go.sum +++ b/go.sum @@ -839,12 +839,12 @@ k8s.io/kube-openapi v0.0.0-20240808142205-8e686545bdb8 h1:1Wof1cGQgA5pqgo8MxKPtf k8s.io/kube-openapi v0.0.0-20240808142205-8e686545bdb8/go.mod h1:Os6V6dZwLNii3vxFpxcNaTmH8LJJBkOTg1N0tOA0fvA= k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A= k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -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/schema v0.0.0-20240814130635-06f7aff93954 h1:0yjDplGHUnZ8NpcfgmH0thXSzG28VSM16hb3Vz171l8= -knative.dev/hack/schema v0.0.0-20240814130635-06f7aff93954/go.mod h1:jRH/sx6mwwuMVhvJgnzSaoYA1N4qaIkJa+zxEGtVA5I= -knative.dev/pkg v0.0.0-20240815051656-89743d9bbf7c h1:2crXVk4FG0dSG6WHaIT+WKbUzn7qG2wn0AfYmvA22zs= -knative.dev/pkg v0.0.0-20240815051656-89743d9bbf7c/go.mod h1:cI2RPEEHZk+/dBpfHobs0aBdPA1mMZVUVWnGAc8NSzM= +knative.dev/hack v0.0.0-20240904112633-9724320e463f h1:UQcD5RVBSEitzbNRQOfoJHJ1Rs29hiii7bzhUvU8s8A= +knative.dev/hack v0.0.0-20240904112633-9724320e463f/go.mod h1:R0ritgYtjLDO9527h5vb5X6gfvt5LCrJ55BNbVDsWiY= +knative.dev/hack/schema v0.0.0-20240904112633-9724320e463f h1:BZvzbQoGGF7VOO/Z8KP1js/e/oipilwYpjdSvQTAjc4= +knative.dev/hack/schema v0.0.0-20240904112633-9724320e463f/go.mod h1:jRH/sx6mwwuMVhvJgnzSaoYA1N4qaIkJa+zxEGtVA5I= +knative.dev/pkg v0.0.0-20240905103434-a1469cf54480 h1:Y9zHlLhIF8BobwQ8JQTROsJoQTgfkxCZIzCXW0Q/b9k= +knative.dev/pkg v0.0.0-20240905103434-a1469cf54480/go.mod h1:eNnDbxvf6coy9eh+qgucG/sZgnDVbBUYPU6PhrwFQnM= knative.dev/reconciler-test v0.0.0-20240820100420-036ce14b8617 h1:UW3CH3wWocQiQKQYxf8gdDw9EEOgL31GU8yXY4w5lE8= knative.dev/reconciler-test v0.0.0-20240820100420-036ce14b8617/go.mod h1:GmL2taVxYoXADdFOl534FcW+rYDQP6LDjWj82Q5yQDI= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= 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 ae07d36d40b..eccbb5ff619 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1064,16 +1064,16 @@ k8s.io/utils/pointer k8s.io/utils/ptr k8s.io/utils/strings/slices k8s.io/utils/trace -# knative.dev/hack v0.0.0-20240814130635-06f7aff93954 +# knative.dev/hack v0.0.0-20240904112633-9724320e463f ## explicit; go 1.21 knative.dev/hack -# knative.dev/hack/schema v0.0.0-20240814130635-06f7aff93954 +# knative.dev/hack/schema v0.0.0-20240904112633-9724320e463f ## explicit; go 1.21 knative.dev/hack/schema/commands knative.dev/hack/schema/docs knative.dev/hack/schema/registry knative.dev/hack/schema/schema -# knative.dev/pkg v0.0.0-20240815051656-89743d9bbf7c +# knative.dev/pkg v0.0.0-20240905103434-a1469cf54480 ## explicit; go 1.22.0 knative.dev/pkg/apiextensions/storageversion knative.dev/pkg/apiextensions/storageversion/cmd/migrate