diff --git a/go.mod b/go.mod index 193d90a4..7b148848 100644 --- a/go.mod +++ b/go.mod @@ -10,8 +10,8 @@ require ( k8s.io/client-go v0.33.4 k8s.io/code-generator v0.33.4 k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff - knative.dev/hack v0.0.0-20250819212547-d496a6e708d3 - knative.dev/pkg v0.0.0-20250817140644-c745f1fcaa2e + knative.dev/hack v0.0.0-20250902153942-1499de21e119 + knative.dev/pkg v0.0.0-20250820014848-e9c87121ec4c ) require ( diff --git a/go.sum b/go.sum index 57190cc2..de65899f 100644 --- a/go.sum +++ b/go.sum @@ -184,10 +184,10 @@ k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff h1:/usPimJzUKKu+m+TE36gUy k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff/go.mod h1:5jIi+8yX4RIb8wk3XwBo5Pq2ccx4FP10ohkbSKCZoK8= k8s.io/utils v0.0.0-20241210054802-24370beab758 h1:sdbE21q2nlQtFh65saZY+rRM6x6aJJI8IUa1AmH/qa0= k8s.io/utils v0.0.0-20241210054802-24370beab758/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -knative.dev/hack v0.0.0-20250819212547-d496a6e708d3 h1:4V+r4q/1ln8U1M1qBotYGfBza7whAf2iMCZtgdhAiu0= -knative.dev/hack v0.0.0-20250819212547-d496a6e708d3/go.mod h1:R0ritgYtjLDO9527h5vb5X6gfvt5LCrJ55BNbVDsWiY= -knative.dev/pkg v0.0.0-20250817140644-c745f1fcaa2e h1:MQvV6He65+DIYxcHWahAij/JSwNUs78JqmONjMZQhtU= -knative.dev/pkg v0.0.0-20250817140644-c745f1fcaa2e/go.mod h1:D3Q1EurZkGaiPNEvPpErGmUU7Ny0WgqGVktfIyH2vYM= +knative.dev/hack v0.0.0-20250902153942-1499de21e119 h1:NbQvjnFK1tL489LN0qAybWy0E17Jpziwcv/XIHwfp6M= +knative.dev/hack v0.0.0-20250902153942-1499de21e119/go.mod h1:R0ritgYtjLDO9527h5vb5X6gfvt5LCrJ55BNbVDsWiY= +knative.dev/pkg v0.0.0-20250820014848-e9c87121ec4c h1:l+HQf+byp7MpDz7A4GHyh6U0Yhf/T0A7zbl5EoLGado= +knative.dev/pkg v0.0.0-20250820014848-e9c87121ec4c/go.mod h1:sYOVxC0GXfovT2qiExFITWHnk0lm6m3WXrZHTsJvQ5k= sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE= sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg= sigs.k8s.io/randfill v0.0.0-20250304075658-069ef1bbf016/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY= diff --git a/vendor/knative.dev/hack/release.sh b/vendor/knative.dev/hack/release.sh index 9130bc9b..f56ceb5c 100644 --- a/vendor/knative.dev/hack/release.sh +++ b/vendor/knative.dev/hack/release.sh @@ -219,11 +219,15 @@ function prepare_dot_release() { # Use the original tag (ie. potentially with a knative- prefix) when determining the last version commit sha local github_tag="$(gh_tool release list --json tagName --jq '.[].tagName' | grep "${last_version}")" local last_release_commit="$(git rev-list -n 1 "${github_tag}")" - local last_release_commit_filtered="$(git rev-list --invert-grep --grep '^(?!\s*>).*?\[skip-dot-release\]'-n 1 "${github_tag}")" + local last_release_commit_filtered="$(git rev-list --invert-grep --grep '^(?!\s*>).*?\[skip-dot-release\]' -n 1 "${github_tag}")" local release_branch_commit="$(git rev-list -n 1 upstream/"${RELEASE_BRANCH}")" local release_branch_commit_filtered="$(git rev-list --invert-grep --grep '^(?!\s*>).*?\[skip-dot-release\]' -n 1 upstream/"${RELEASE_BRANCH}")" + [[ -n "${last_release_commit}" ]] || abort "cannot get last release commit" [[ -n "${release_branch_commit}" ]] || abort "cannot get release branch last commit" + [[ -n "${last_release_commit_filtered}" ]] || abort "cannot get filtered last release commit" + [[ -n "${release_branch_commit_filtered}" ]] || abort "cannot get filtered release branch last commit" + 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." 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." if [[ "${last_release_commit_filtered}" == "${release_branch_commit_filtered}" ]]; then diff --git a/vendor/modules.txt b/vendor/modules.txt index 87a29265..14b9a092 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -718,10 +718,10 @@ k8s.io/utils/net k8s.io/utils/pointer k8s.io/utils/ptr k8s.io/utils/trace -# knative.dev/hack v0.0.0-20250819212547-d496a6e708d3 +# knative.dev/hack v0.0.0-20250902153942-1499de21e119 ## explicit; go 1.21 knative.dev/hack -# knative.dev/pkg v0.0.0-20250817140644-c745f1fcaa2e +# knative.dev/pkg v0.0.0-20250820014848-e9c87121ec4c ## explicit; go 1.24.0 knative.dev/pkg/apis knative.dev/pkg/apis/duck