diff --git a/go.mod b/go.mod index 8aabee381..a3f118568 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.23.0 require ( github.com/google/go-github/v32 v32.1.0 gopkg.in/yaml.v2 v2.3.0 - knative.dev/hack v0.0.0-20250514121446-f525e187efdc + knative.dev/hack v0.0.0-20250819212547-d496a6e708d3 ) require ( diff --git a/go.sum b/go.sum index d6e4a381c..d1334d003 100644 --- a/go.sum +++ b/go.sum @@ -23,5 +23,5 @@ gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8X gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -knative.dev/hack v0.0.0-20250514121446-f525e187efdc h1:8HmclJlA0zNE/G1SkgdC3/IFSSyhaSz2iIhihU6YbEo= -knative.dev/hack v0.0.0-20250514121446-f525e187efdc/go.mod h1:R0ritgYtjLDO9527h5vb5X6gfvt5LCrJ55BNbVDsWiY= +knative.dev/hack v0.0.0-20250819212547-d496a6e708d3 h1:4V+r4q/1ln8U1M1qBotYGfBza7whAf2iMCZtgdhAiu0= +knative.dev/hack v0.0.0-20250819212547-d496a6e708d3/go.mod h1:R0ritgYtjLDO9527h5vb5X6gfvt5LCrJ55BNbVDsWiY= diff --git a/vendor/knative.dev/hack/release.sh b/vendor/knative.dev/hack/release.sh index a9901aa34..9130bc9b2 100644 --- a/vendor/knative.dev/hack/release.sh +++ b/vendor/knative.dev/hack/release.sh @@ -219,9 +219,9 @@ 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 "\[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 "\[skip-dot-release\]" -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" 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." diff --git a/vendor/modules.txt b/vendor/modules.txt index 88e913204..be187d775 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -22,7 +22,7 @@ golang.org/x/crypto/openpgp/s2k # gopkg.in/yaml.v2 v2.3.0 ## explicit gopkg.in/yaml.v2 -# knative.dev/hack v0.0.0-20250514121446-f525e187efdc +# knative.dev/hack v0.0.0-20250819212547-d496a6e708d3 ## explicit; go 1.21 knative.dev/hack # go.opencensus.io => go.opencensus.io v0.20.2