Skip to content

Commit 21168fe

Browse files
upgrade to latest dependencies
bumping knative.dev/client-pkg 22f5989...12612b7: > 12612b7 Update community files (# 195) > 788e072 Update community files (# 194) > eb73a58 🗑️ Deprecate knative.dev/client-pkg (# 193) bumping knative.dev/hack 06f7aff...05b2fb3: > 05b2fb3 Update community files (# 399) > fc6a845 Update community files (# 398) > 9724320 Fix premature codegen cleanup exit on 1 (# 397) Signed-off-by: Knative Automation <[email protected]>
1 parent 6f32d54 commit 21168fe

File tree

5 files changed

+21
-19
lines changed

5 files changed

+21
-19
lines changed

go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ go 1.22
55
require (
66
github.com/spf13/cobra v1.7.0
77
gotest.tools/v3 v3.3.0
8-
knative.dev/client-pkg v0.0.0-20240808015000-22f598931483
9-
knative.dev/hack v0.0.0-20240814130635-06f7aff93954
8+
knative.dev/client-pkg v0.0.0-20241010131738-12612b7a7822
9+
knative.dev/hack v0.0.0-20241010131451-05b2fb30cb4d
1010
)
1111

1212
require (

go.sum

+4-4
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,10 @@ k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw=
7979
k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
8080
k8s.io/utils v0.0.0-20240102154912-e7106e64919e h1:eQ/4ljkx21sObifjzXwlPKpdGLrCfRziVtos3ofG/sQ=
8181
k8s.io/utils v0.0.0-20240102154912-e7106e64919e/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
82-
knative.dev/client-pkg v0.0.0-20240808015000-22f598931483 h1:jBfmxcR0H5Z9IzamelZtmmg9jfeOXfssllUVX5M4Xzs=
83-
knative.dev/client-pkg v0.0.0-20240808015000-22f598931483/go.mod h1:Y56KfZx3gJJpju88l86jQ9csxywLiopR0GkxCWW3+Kg=
84-
knative.dev/hack v0.0.0-20240814130635-06f7aff93954 h1:dGMK5VoL75szvrYQTL9NqhPYHu1f5dGaXx1hJI8fAFM=
85-
knative.dev/hack v0.0.0-20240814130635-06f7aff93954/go.mod h1:R0ritgYtjLDO9527h5vb5X6gfvt5LCrJ55BNbVDsWiY=
82+
knative.dev/client-pkg v0.0.0-20241010131738-12612b7a7822 h1:5SW0WZxq8X2swhjSQBciWIGkaJr9XFrddbmuQCYY8kE=
83+
knative.dev/client-pkg v0.0.0-20241010131738-12612b7a7822/go.mod h1:LZur1NaQ0sSun/QEZ5R2I99bS5lOW//Y68JLpUEpkJc=
84+
knative.dev/hack v0.0.0-20241010131451-05b2fb30cb4d h1:aCfX7kwkvgGxXXGbso5tLqdwQmzBkJ9d+EIRwksKTvk=
85+
knative.dev/hack v0.0.0-20241010131451-05b2fb30cb4d/go.mod h1:R0ritgYtjLDO9527h5vb5X6gfvt5LCrJ55BNbVDsWiY=
8686
knative.dev/pkg v0.0.0-20240716082220-4355f0c73608 h1:BOiRzcnRS9Z5ruxlCiS/K1/Hb5bUN0X4W3xCegdcYQE=
8787
knative.dev/pkg v0.0.0-20240716082220-4355f0c73608/go.mod h1:M67lDZ4KbltYSon0Ox4/6qjlZNOIXW4Ldequ81yofbw=
8888
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=

vendor/knative.dev/hack/codegen-library.sh

+12-10
Original file line numberDiff line numberDiff line change
@@ -133,16 +133,18 @@ function restore-changes-if-its-copyright-year-only() {
133133
local difflist
134134
log "Cleaning up generated code"
135135
difflist="$(mktemp)"
136-
git diff --exit-code --name-only > "$difflist"
137-
# list git changes and skip those which differ only in the boilerplate year
138-
while read -r file; do
139-
# check if the file contains just the change in the boilerplate year
140-
if [ "$(LANG=C git diff --exit-code --shortstat -- "$file")" = ' 1 file changed, 1 insertion(+), 1 deletion(-)' ] && \
141-
[[ "$(git diff --exit-code -U1 -- "$file" | grep -Ec '^[+-]\s*[*#]?\s*Copyright 2[0-9]{3}')" -eq 2 ]]; then
142-
# restore changes to that file
143-
git checkout -- "$file"
144-
fi
145-
done < "$difflist"
136+
if ! git diff --exit-code --name-only > /dev/null; then
137+
# list git changes and skip those which differ only in the boilerplate year
138+
git diff --name-only > "$difflist"
139+
while read -r file; do
140+
# check if the file contains just the change in the boilerplate year
141+
if [ "$(LANG=C git diff --exit-code --shortstat -- "$file")" = ' 1 file changed, 1 insertion(+), 1 deletion(-)' ] && \
142+
[[ "$(git diff --exit-code -U1 -- "$file" | grep -Ec '^[+-]\s*[*#]?\s*Copyright 2[0-9]{3}')" -eq 2 ]]; then
143+
# restore changes to that file
144+
git checkout -- "$file"
145+
fi
146+
done < "$difflist"
147+
fi
146148
rm -f "$difflist"
147149
}
148150

vendor/knative.dev/hack/library.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -774,7 +774,7 @@ function go_update_deps() {
774774
function __clean_goworksum_if_exists() {
775775
if [ -f "$REPO_ROOT_DIR/go.work.sum" ]; then
776776
log.step 'Cleaning the go.work.sum file'
777-
truncate --size 0 "$REPO_ROOT_DIR/go.work.sum"
777+
truncate -s 0 "$REPO_ROOT_DIR/go.work.sum"
778778
fi
779779
}
780780

vendor/modules.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ gotest.tools/v3/internal/assert
2525
gotest.tools/v3/internal/difflib
2626
gotest.tools/v3/internal/format
2727
gotest.tools/v3/internal/source
28-
# knative.dev/client-pkg v0.0.0-20240808015000-22f598931483
28+
# knative.dev/client-pkg v0.0.0-20241010131738-12612b7a7822
2929
## explicit; go 1.22
3030
knative.dev/client-pkg/pkg/plugin
31-
# knative.dev/hack v0.0.0-20240814130635-06f7aff93954
31+
# knative.dev/hack v0.0.0-20241010131451-05b2fb30cb4d
3232
## explicit; go 1.21
3333
knative.dev/hack

0 commit comments

Comments
 (0)