Skip to content

Commit

Permalink
upgrade to latest dependencies (#1002)
Browse files Browse the repository at this point in the history
bumping knative.dev/hack 06f7aff...9724320:
  > 9724320 Fix premature codegen cleanup exit on 1 (# 397)

Signed-off-by: Knative Automation <[email protected]>
  • Loading branch information
knative-automation authored Sep 5, 2024
1 parent 37fdbdd commit 0efcb4c
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 15 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ 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/hack v0.0.0-20240904112633-9724320e463f
knative.dev/pkg v0.0.0-20240815051656-89743d9bbf7c
sigs.k8s.io/yaml v1.4.0
)
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -670,8 +670,8 @@ 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 v0.0.0-20240904112633-9724320e463f h1:UQcD5RVBSEitzbNRQOfoJHJ1Rs29hiii7bzhUvU8s8A=
knative.dev/hack v0.0.0-20240904112633-9724320e463f/go.mod h1:R0ritgYtjLDO9527h5vb5X6gfvt5LCrJ55BNbVDsWiY=
knative.dev/pkg v0.0.0-20240815051656-89743d9bbf7c h1:2crXVk4FG0dSG6WHaIT+WKbUzn7qG2wn0AfYmvA22zs=
knative.dev/pkg v0.0.0-20240815051656-89743d9bbf7c/go.mod h1:cI2RPEEHZk+/dBpfHobs0aBdPA1mMZVUVWnGAc8NSzM=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
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
2 changes: 1 addition & 1 deletion vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -717,7 +717,7 @@ 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/pkg v0.0.0-20240815051656-89743d9bbf7c
Expand Down

0 comments on commit 0efcb4c

Please sign in to comment.