Skip to content

Commit 216c2af

Browse files
houshengbohoushengbo
committed
[release-1.18] Updated the hack lib to the lastest
1 parent d82e543 commit 216c2af

File tree

9 files changed

+35
-12
lines changed

9 files changed

+35
-12
lines changed

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ require (
2222
k8s.io/code-generator v0.32.2
2323
knative.dev/caching v0.0.0-20250415164313-8f20a1163dbf
2424
knative.dev/eventing v0.45.4
25-
knative.dev/hack v0.0.0-20250331013814-c577ed9f7775
25+
knative.dev/hack v0.0.0-20251021013703-4fae78067103
2626
knative.dev/pkg v0.0.0-20250415155312-ed3e2158b883
2727
knative.dev/reconciler-test v0.0.0-20250415170512-23f86169156f
2828
knative.dev/serving v0.45.1

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1718,8 +1718,8 @@ knative.dev/caching v0.0.0-20250415164313-8f20a1163dbf h1:qQnKB6mx+beHzsoKU8aKrR
17181718
knative.dev/caching v0.0.0-20250415164313-8f20a1163dbf/go.mod h1:q8ma7YxJ8Dofr+5kf3qR72A/7Zxl9uqQlOdMwNgCXY4=
17191719
knative.dev/eventing v0.45.4 h1:M0HjsFipG6AD+ZMYRXqbSsQfBK4BXlFGEQcsCDlR9mk=
17201720
knative.dev/eventing v0.45.4/go.mod h1:Fz5VjV/vWVN93UfTX3lzc+uFrvJ9wxiiKrRIPhQxoj8=
1721-
knative.dev/hack v0.0.0-20250331013814-c577ed9f7775 h1:UstB8/aowofYFHjLyZdPh1K7qB9BCx+lP1WuiCspYRE=
1722-
knative.dev/hack v0.0.0-20250331013814-c577ed9f7775/go.mod h1:R0ritgYtjLDO9527h5vb5X6gfvt5LCrJ55BNbVDsWiY=
1721+
knative.dev/hack v0.0.0-20251021013703-4fae78067103 h1:j96YY5CLCTytWZsGVzixVvNasRbrni2NuXI54R+IPvA=
1722+
knative.dev/hack v0.0.0-20251021013703-4fae78067103/go.mod h1:L5RzHgbvam0u8QFHfzCX6MKxu/a/gIGEdaRBqNiVbl0=
17231723
knative.dev/networking v0.0.0-20250415164913-6268d931d247 h1:BQcW8ur+WAmj6GCpYHyUyWoaJWVTs/75W1EObUV/bdA=
17241724
knative.dev/networking v0.0.0-20250415164913-6268d931d247/go.mod h1:Y6OMRz/12RC8fzVa3gAB6K8BR415xbF4z35IAbdMHFc=
17251725
knative.dev/pkg v0.0.0-20250415155312-ed3e2158b883 h1:UeOY7009M0EHwdyW3P35Fc1U6FJHzBrj6Gf370do8zY=

‎vendor/knative.dev/hack/go.work‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
go 1.21
1+
go 1.24.0
22

33
use (
44
.

‎vendor/knative.dev/hack/go.work.sum‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,19 +84,33 @@ github.com/sahilm/fuzzy v0.1.1/go.mod h1:VFvziUEIMCrT6A6tw2RFIXPXXmzXbOsSHF0DOI8
8484
github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
8585
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no=
8686
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM=
87+
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
8788
github.com/yuin/goldmark v1.7.1 h1:3bajkSilaCbjdKVsKdZjZCLBNPL9pYzrCakKaf4U49U=
8889
github.com/yuin/goldmark v1.7.1/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E=
8990
github.com/yuin/goldmark-emoji v1.0.2 h1:c/RgTShNgHTtc6xdz2KKI74jJr6rWi7FPgnP9GAsO5s=
9091
github.com/yuin/goldmark-emoji v1.0.2/go.mod h1:RhP/RWpexdp+KHs7ghKnifRoIs/Bq4nDS7tRbCkOwKY=
9192
golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI=
9293
golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
94+
golang.org/x/crypto v0.43.0 h1:dduJYIi3A3KOfdGOHX8AVZ/jGiyPa3IbBozJ5kNuE04=
95+
golang.org/x/crypto v0.43.0/go.mod h1:BFbav4mRNlXJL4wNeejLpWxB7wMbc79PdRGhWKncxR0=
9396
golang.org/x/exp v0.0.0-20240525044651-4c93da0ed11d h1:N0hmiNbwsSNwHBAvR3QB5w25pUwH4tK0Y/RltD1j1h4=
9497
golang.org/x/exp v0.0.0-20240525044651-4c93da0ed11d/go.mod h1:XtvwrStGgqGPLc4cjQfWqZHG1YFdYs6swckp8vpsjnc=
98+
golang.org/x/mod v0.28.0/go.mod h1:yfB/L0NOf/kmEbXjzCPOx1iK1fRutOydrCMsqRhEBxI=
99+
golang.org/x/net v0.46.0/go.mod h1:Q9BGdFy1y4nkUwiLvT5qtyhAnEHgnQ/zd8PfU6nc210=
95100
golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
96101
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
102+
golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug=
103+
golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
104+
golang.org/x/telemetry v0.0.0-20251008203120-078029d740a8 h1:LvzTn0GQhWuvKH/kVRS3R3bVAsdQWI7hvfLHGgh9+lU=
105+
golang.org/x/telemetry v0.0.0-20251008203120-078029d740a8/go.mod h1:Pi4ztBfryZoJEkyFTI5/Ocsu2jXyDr6iSdgJiYE/uwE=
97106
golang.org/x/term v0.20.0 h1:VnkxpohqXaOBYJtBmEppKUG6mXpi+4O6purfc2+sMhw=
98107
golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
108+
golang.org/x/term v0.36.0 h1:zMPR+aF8gfksFprF/Nc/rd1wRS1EI6nDBGyWAvDzx2Q=
109+
golang.org/x/term v0.36.0/go.mod h1:Qu394IJq6V6dCBRgwqshf3mPF85AqzYEzofzRdZkWss=
110+
golang.org/x/text v0.30.0 h1:yznKA/E9zq54KzlzBEAWn1NXSQ8DIp/NYMy88xJjl4k=
111+
golang.org/x/text v0.30.0/go.mod h1:yDdHFIX9t+tORqspjENWgzaCVXgk0yYnYuSZ8UzzBVM=
99112
golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
100113
golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
114+
golang.org/x/tools v0.37.0/go.mod h1:MBN5QPQtLMHVdvsbtarmTNukZDdgwdwlO5qGacAzF0w=
101115
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk=
102116
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=

‎vendor/knative.dev/hack/infra-library.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ source "$(dirname "${BASH_SOURCE[0]:-$0}")/library.sh"
2121

2222
# Default Kubernetes version to use for GKE, if not overridden with
2323
# the `--cluster-version` parameter.
24-
readonly GKE_DEFAULT_CLUSTER_VERSION="1.31"
24+
readonly GKE_DEFAULT_CLUSTER_VERSION="1.32"
2525

2626
# Dumps the k8s api server metrics. Spins up a proxy, waits a little bit and
2727
# dumps the metrics to ${ARTIFACTS}/k8s.metrics.txt

‎vendor/knative.dev/hack/library.sh‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -588,7 +588,7 @@ function report_go_test() {
588588
logfile="${logfile/.xml/.jsonl}"
589589
echo "Running go test with args: ${go_test_args[*]}"
590590
local gotest_retcode=0
591-
go_run gotest.tools/gotestsum@v1.11.0 \
591+
go_run gotest.tools/gotestsum@v1.13.0 \
592592
--format "${GO_TEST_VERBOSITY:-testname}" \
593593
--junitfile "${xml}" \
594594
--junitfile-testsuite-name relative \
@@ -681,7 +681,7 @@ function start_knative_eventing_extension() {
681681
# Parameters: $1 - tool package for go run.
682682
# $2..$n - parameters passed to the tool.
683683
function go_run() {
684-
local package
684+
local package gotoolchain
685685
package="$1"
686686
if [[ "$package" != *@* ]]; then
687687
abort 'Package for "go_run" needs to have @version'
@@ -696,6 +696,11 @@ function go_run() {
696696
GORUN_PATH="$(mktemp -t -d -u gopath.XXXXXXXX)"
697697
fi
698698
export GORUN_PATH
699+
gotoolchain="$(go env GOTOOLCHAIN)"
700+
if [[ "$package" == knative.dev/toolbox/* ]]; then
701+
gotoolchain=auto
702+
fi
703+
GOTOOLCHAIN="${gotoolchain}" \
699704
GOPATH="${GORUN_PATH}" \
700705
GOFLAGS='' \
701706
go run "$package" "$@"

‎vendor/knative.dev/hack/presubmit-tests.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ function __build_test_runner_for_module() {
141141
# Don't merge these two lines, or return code will always be 0.
142142
# Get all build tags in go code (ignore /vendor, /hack and /third_party)
143143
local tags
144-
tags="$(go run knative.dev/toolbox/go-ls-tags@latest --joiner=,)"
144+
tags="$(go_run knative.dev/toolbox/go-ls-tags@latest --joiner=,)"
145145
local go_pkg_dirs
146146
go_pkg_dirs="$(go list -tags "${tags}" ./...)" || return $?
147147
if [[ -z "${go_pkg_dirs}" ]]; then

‎vendor/knative.dev/hack/release.sh‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,11 +219,15 @@ function prepare_dot_release() {
219219
# Use the original tag (ie. potentially with a knative- prefix) when determining the last version commit sha
220220
local github_tag="$(gh_tool release list --json tagName --jq '.[].tagName' | grep "${last_version}")"
221221
local last_release_commit="$(git rev-list -n 1 "${github_tag}")"
222-
local last_release_commit_filtered="$(git rev-list --invert-grep --grep "\[skip-dot-release\]" -n 1 "${github_tag}")"
222+
local last_release_commit_filtered="$(git rev-list --invert-grep --grep '^(?!\s*>).*?\[skip-dot-release\]' -n 1 "${github_tag}")"
223223
local release_branch_commit="$(git rev-list -n 1 upstream/"${RELEASE_BRANCH}")"
224-
local release_branch_commit_filtered="$(git rev-list --invert-grep --grep "\[skip-dot-release\]" -n 1 upstream/"${RELEASE_BRANCH}")"
224+
local release_branch_commit_filtered="$(git rev-list --invert-grep --grep '^(?!\s*>).*?\[skip-dot-release\]' -n 1 upstream/"${RELEASE_BRANCH}")"
225+
225226
[[ -n "${last_release_commit}" ]] || abort "cannot get last release commit"
226227
[[ -n "${release_branch_commit}" ]] || abort "cannot get release branch last commit"
228+
[[ -n "${last_release_commit_filtered}" ]] || abort "cannot get filtered last release commit"
229+
[[ -n "${release_branch_commit_filtered}" ]] || abort "cannot get filtered release branch last commit"
230+
227231
echo "Version ${last_version} is at commit ${last_release_commit}. Comparing using ${last_release_commit_filtered}. If it is different is because commits with the [skip-dot-release] flag in their commit body are not being considered."
228232
echo "Branch ${RELEASE_BRANCH} is at commit ${release_branch_commit}. Comparing using ${release_branch_commit_filtered}. If it is different is because commits with the [skip-dot-release] flag in their commit body are not being considered."
229233
if [[ "${last_release_commit_filtered}" == "${release_branch_commit_filtered}" ]]; then

‎vendor/modules.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1522,8 +1522,8 @@ knative.dev/eventing/test/upgrade/prober/wathola/fetcher
15221522
knative.dev/eventing/test/upgrade/prober/wathola/forwarder
15231523
knative.dev/eventing/test/upgrade/prober/wathola/receiver
15241524
knative.dev/eventing/test/upgrade/prober/wathola/sender
1525-
# knative.dev/hack v0.0.0-20250331013814-c577ed9f7775
1526-
## explicit; go 1.21
1525+
# knative.dev/hack v0.0.0-20251021013703-4fae78067103
1526+
## explicit; go 1.24
15271527
knative.dev/hack
15281528
# knative.dev/networking v0.0.0-20250415164913-6268d931d247
15291529
## explicit; go 1.23.0

0 commit comments

Comments
 (0)