From 1bd7599a8639602b44a002b28ee2fb1607bdc530 Mon Sep 17 00:00:00 2001 From: Knative Automation Date: Thu, 5 Sep 2024 13:37:33 +0000 Subject: [PATCH] upgrade to latest dependencies bumping knative.dev/networking d4c57cd...0efcb4c: > 0efcb4c upgrade to latest dependencies (# 1002) > 37fdbdd upgrade to latest dependencies (# 1000) bumping knative.dev/pkg cd3311c...a1469cf: > a1469cf upgrade to latest dependencies (# 3088) > 89743d9 upgrade to latest dependencies (# 3085) bumping knative.dev/hack 06f7aff...9724320: > 9724320 Fix premature codegen cleanup exit on 1 (# 397) 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 | 8 ++++---- 5 files changed, 26 insertions(+), 24 deletions(-) diff --git a/go.mod b/go.mod index a8481ed16..fcc9d299e 100644 --- a/go.mod +++ b/go.mod @@ -20,9 +20,9 @@ require ( k8s.io/client-go v0.30.3 k8s.io/code-generator v0.30.3 k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 - knative.dev/hack v0.0.0-20240814130635-06f7aff93954 - knative.dev/networking v0.0.0-20240808015019-d4c57cd4a1b3 - knative.dev/pkg v0.0.0-20240812053209-cd3311cbab65 + knative.dev/hack v0.0.0-20240904112633-9724320e463f + knative.dev/networking v0.0.0-20240905103434-0efcb4cb6806 + knative.dev/pkg v0.0.0-20240905103434-a1469cf54480 sigs.k8s.io/gateway-api v1.1.0 sigs.k8s.io/yaml v1.4.0 ) diff --git a/go.sum b/go.sum index bdc2f3445..248986a8d 100644 --- a/go.sum +++ b/go.sum @@ -678,12 +678,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/networking v0.0.0-20240808015019-d4c57cd4a1b3 h1:KfIea0RVx0QfHK0gHruJfacT2kBVb4hZE8Sgzs32KKo= -knative.dev/networking v0.0.0-20240808015019-d4c57cd4a1b3/go.mod h1:QsOtfjxoHEzWvLa8y+mSts95UKUmzTvmgPxWoi7XHMQ= -knative.dev/pkg v0.0.0-20240812053209-cd3311cbab65 h1:9r795uNPp2f/dIUzHlJW4Prz3U+8+1ZpW4z6EBUxpwc= -knative.dev/pkg v0.0.0-20240812053209-cd3311cbab65/go.mod h1:2kizutszzGp+EcVXivdigNd6dUM7O77QaLUTZeKaN5s= +knative.dev/hack v0.0.0-20240904112633-9724320e463f h1:UQcD5RVBSEitzbNRQOfoJHJ1Rs29hiii7bzhUvU8s8A= +knative.dev/hack v0.0.0-20240904112633-9724320e463f/go.mod h1:R0ritgYtjLDO9527h5vb5X6gfvt5LCrJ55BNbVDsWiY= +knative.dev/networking v0.0.0-20240905103434-0efcb4cb6806 h1:Y8oeLfGVE1gcxK8ZV3HtvQsfdAFeCNflj3qRobbpEEo= +knative.dev/networking v0.0.0-20240905103434-0efcb4cb6806/go.mod h1:i7nMwzWWbsorxAL9e88yTl/PugUDvtL6KtG5H/L0sg8= +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= 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/codegen-library.sh b/vendor/knative.dev/hack/codegen-library.sh index 01a43132d..42ece681c 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 08f2dba16..d487a1495 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 b838842df..b1897ed2d 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -902,11 +902,11 @@ 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/networking v0.0.0-20240808015019-d4c57cd4a1b3 -## explicit; go 1.22 +# knative.dev/networking v0.0.0-20240905103434-0efcb4cb6806 +## explicit; go 1.22.0 knative.dev/networking/config knative.dev/networking/pkg knative.dev/networking/pkg/apis/networking @@ -949,7 +949,7 @@ knative.dev/networking/test/test_images/runtime/handlers knative.dev/networking/test/test_images/timeout knative.dev/networking/test/test_images/wsserver knative.dev/networking/test/types -# knative.dev/pkg v0.0.0-20240812053209-cd3311cbab65 +# knative.dev/pkg v0.0.0-20240905103434-a1469cf54480 ## explicit; go 1.22.0 knative.dev/pkg/apis knative.dev/pkg/apis/duck