Skip to content

Commit

Permalink
upgrade to latest dependencies
Browse files Browse the repository at this point in the history
bumping knative.dev/client-pkg 22f5989...788e072:
  > 788e072 Update community files (# 194)
  > eb73a58 🗑️ Deprecate knative.dev/client-pkg (# 193)
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 <automation@knative.team>
  • Loading branch information
knative-automation committed Sep 9, 2024
1 parent 5e15895 commit 31396f5
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 19 deletions.
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ go 1.22
require (
github.com/spf13/cobra v1.7.0
gotest.tools/v3 v3.3.0
knative.dev/client-pkg v0.0.0-20240808015000-22f598931483
knative.dev/hack v0.0.0-20240814130635-06f7aff93954
knative.dev/client-pkg v0.0.0-20240909014924-788e0725213a
knative.dev/hack v0.0.0-20240909014011-fc6a8452af6d
)

require (
Expand Down
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,10 @@ k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw=
k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
k8s.io/utils v0.0.0-20240102154912-e7106e64919e h1:eQ/4ljkx21sObifjzXwlPKpdGLrCfRziVtos3ofG/sQ=
k8s.io/utils v0.0.0-20240102154912-e7106e64919e/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
knative.dev/client-pkg v0.0.0-20240808015000-22f598931483 h1:jBfmxcR0H5Z9IzamelZtmmg9jfeOXfssllUVX5M4Xzs=
knative.dev/client-pkg v0.0.0-20240808015000-22f598931483/go.mod h1:Y56KfZx3gJJpju88l86jQ9csxywLiopR0GkxCWW3+Kg=
knative.dev/hack v0.0.0-20240814130635-06f7aff93954 h1:dGMK5VoL75szvrYQTL9NqhPYHu1f5dGaXx1hJI8fAFM=
knative.dev/hack v0.0.0-20240814130635-06f7aff93954/go.mod h1:R0ritgYtjLDO9527h5vb5X6gfvt5LCrJ55BNbVDsWiY=
knative.dev/client-pkg v0.0.0-20240909014924-788e0725213a h1:YJOBxVgINAAP69sTXYogck1OYCO4WY64EOUYZZsWS3U=
knative.dev/client-pkg v0.0.0-20240909014924-788e0725213a/go.mod h1:LZur1NaQ0sSun/QEZ5R2I99bS5lOW//Y68JLpUEpkJc=
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=
knative.dev/pkg v0.0.0-20240716082220-4355f0c73608 h1:BOiRzcnRS9Z5ruxlCiS/K1/Hb5bUN0X4W3xCegdcYQE=
knative.dev/pkg v0.0.0-20240716082220-4355f0c73608/go.mod h1:M67lDZ4KbltYSon0Ox4/6qjlZNOIXW4Ldequ81yofbw=
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
Expand Down
22 changes: 12 additions & 10 deletions vendor/knative.dev/hack/codegen-library.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}

Expand Down
2 changes: 1 addition & 1 deletion vendor/knative.dev/hack/library.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
4 changes: 2 additions & 2 deletions vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ gotest.tools/v3/internal/assert
gotest.tools/v3/internal/difflib
gotest.tools/v3/internal/format
gotest.tools/v3/internal/source
# knative.dev/client-pkg v0.0.0-20240808015000-22f598931483
# knative.dev/client-pkg v0.0.0-20240909014924-788e0725213a
## explicit; go 1.22
knative.dev/client-pkg/pkg/plugin
# knative.dev/hack v0.0.0-20240814130635-06f7aff93954
# knative.dev/hack v0.0.0-20240909014011-fc6a8452af6d
## explicit; go 1.21
knative.dev/hack

0 comments on commit 31396f5

Please sign in to comment.