diff --git a/go.mod b/go.mod index e229860f7..212f0949e 100644 --- a/go.mod +++ b/go.mod @@ -12,9 +12,9 @@ require ( k8s.io/client-go v0.33.4 k8s.io/code-generator v0.33.4 k8s.io/utils v0.0.0-20241210054802-24370beab758 - knative.dev/hack v0.0.0-20250819212847-f88b7db09b1c - knative.dev/networking v0.0.0-20250821144952-042b64d7bbde - knative.dev/pkg v0.0.0-20250821143151-4ffdcf6b3fa5 + knative.dev/hack v0.0.0-20250902154142-af735b2738d6 + knative.dev/networking v0.0.0-20250902160145-7dad473f6351 + knative.dev/pkg v0.0.0-20250902154944-9aa11443ba68 sigs.k8s.io/gateway-api v1.2.1 sigs.k8s.io/yaml v1.6.0 ) diff --git a/go.sum b/go.sum index d7d01d4ce..95d444244 100644 --- a/go.sum +++ b/go.sum @@ -257,12 +257,12 @@ 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-20250819212847-f88b7db09b1c h1:eG94MceyTPHalVaBXAaIVXkD1zLdrM9BpVD2oXbpEXs= -knative.dev/hack v0.0.0-20250819212847-f88b7db09b1c/go.mod h1:R0ritgYtjLDO9527h5vb5X6gfvt5LCrJ55BNbVDsWiY= -knative.dev/networking v0.0.0-20250821144952-042b64d7bbde h1:Gr1rIK8Zx+tO+NLrhSJzZUGucVjmIR+Lm+eUqwhen+I= -knative.dev/networking v0.0.0-20250821144952-042b64d7bbde/go.mod h1:sjPfq6T/exWuYK9w+CF4E59bU8m2dlJAgnRdK5wo9k0= -knative.dev/pkg v0.0.0-20250821143151-4ffdcf6b3fa5 h1:2U4nNoTuF/3enFcPp1BVQXCjUC4XfieIHkZeuU7j8uA= -knative.dev/pkg v0.0.0-20250821143151-4ffdcf6b3fa5/go.mod h1:ewap/fhCZCh6Gm+F6udBION8T2+UcJFK4L1Ss/5K8Dw= +knative.dev/hack v0.0.0-20250902154142-af735b2738d6 h1:JYZgO9bni32T+BB5v6WpeRFm1hjj+EypBLZCk6HZBt0= +knative.dev/hack v0.0.0-20250902154142-af735b2738d6/go.mod h1:R0ritgYtjLDO9527h5vb5X6gfvt5LCrJ55BNbVDsWiY= +knative.dev/networking v0.0.0-20250902160145-7dad473f6351 h1:Gv/UqbN0AK+ORoT5e2Kg+3+uMW/y9CCdhpXKxYaVV6k= +knative.dev/networking v0.0.0-20250902160145-7dad473f6351/go.mod h1:P/fAhhVDgmLt1ugFX8vBvdSDiUOw2P4SGcjbzoZ02Xw= +knative.dev/pkg v0.0.0-20250902154944-9aa11443ba68 h1:QlgJtxC1LtNf9k1OMSHdr3dq+HjtOOmB/SV/SklVt2k= +knative.dev/pkg v0.0.0-20250902154944-9aa11443ba68/go.mod h1:a1amDzo4YIUNuGeDgEz/uDHs5MQVYI1DXnRnEpWCAts= sigs.k8s.io/gateway-api v1.2.1 h1:fZZ/+RyRb+Y5tGkwxFKuYuSRQHu9dZtbjenblleOLHM= sigs.k8s.io/gateway-api v1.2.1/go.mod h1:EpNfEXNjiYfUJypf0eZ0P5iXA9ekSGWaS1WgPaM42X0= sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE= diff --git a/vendor/knative.dev/hack/release.sh b/vendor/knative.dev/hack/release.sh index 9130bc9b2..f56ceb5cf 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 5976ddafb..b39bf6bd4 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1011,10 +1011,10 @@ k8s.io/utils/net k8s.io/utils/pointer k8s.io/utils/ptr k8s.io/utils/trace -# knative.dev/hack v0.0.0-20250819212847-f88b7db09b1c +# knative.dev/hack v0.0.0-20250902154142-af735b2738d6 ## explicit; go 1.21 knative.dev/hack -# knative.dev/networking v0.0.0-20250821144952-042b64d7bbde +# knative.dev/networking v0.0.0-20250902160145-7dad473f6351 ## explicit; go 1.24.0 knative.dev/networking/config knative.dev/networking/pkg @@ -1058,7 +1058,7 @@ knative.dev/networking/test/test_images/runtime/handlers knative.dev/networking/test/test_images/timeout knative.dev/networking/test/test_images/wsserver knative.dev/networking/test/types -# knative.dev/pkg v0.0.0-20250821143151-4ffdcf6b3fa5 +# knative.dev/pkg v0.0.0-20250902154944-9aa11443ba68 ## explicit; go 1.24.0 knative.dev/pkg/apis knative.dev/pkg/apis/duck