diff --git a/go.mod b/go.mod index 617d809a..bdd98957 100644 --- a/go.mod +++ b/go.mod @@ -10,6 +10,6 @@ require ( k8s.io/client-go v0.23.8 k8s.io/code-generator v0.23.8 k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 - knative.dev/hack v0.0.0-20220610014127-dc6c287516dc - knative.dev/pkg v0.0.0-20220621173822-9c5a7317fa9d + knative.dev/hack v0.0.0-20220629134730-e7d63651ce8f + knative.dev/pkg v0.0.0-20220629132331-f4ae0aff5b9c ) diff --git a/go.sum b/go.sum index cf0a14c4..eeacdae5 100644 --- a/go.sum +++ b/go.sum @@ -1145,10 +1145,10 @@ k8s.io/utils v0.0.0-20211116205334-6203023598ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/ k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 h1:HNSDgDCrr/6Ly3WEGKZftiE7IY19Vz2GdbOCyI4qqhc= k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= knative.dev/hack v0.0.0-20220524153203-12d3e2a7addc/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI= -knative.dev/hack v0.0.0-20220610014127-dc6c287516dc h1:LyqyT+rtgZYfOb3ChGE5jTFApCOcUmAcSV+TzgLxnys= -knative.dev/hack v0.0.0-20220610014127-dc6c287516dc/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI= -knative.dev/pkg v0.0.0-20220621173822-9c5a7317fa9d h1:H/naKtQODjCIr9wFb1YOG17CgbkgSFMy5dX0WZnrz6o= -knative.dev/pkg v0.0.0-20220621173822-9c5a7317fa9d/go.mod h1:hmwyuQ6uQlqLVEM4lJGg6LZ12gbnUQv9kH88sA5pLDg= +knative.dev/hack v0.0.0-20220629134730-e7d63651ce8f h1:FwQQcK4wqx53DYnwFNbmixKaAks0328Ys4qwF8nzQew= +knative.dev/hack v0.0.0-20220629134730-e7d63651ce8f/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI= +knative.dev/pkg v0.0.0-20220629132331-f4ae0aff5b9c h1:kkJWYg3h6bLAOt7q1elSiE8NHosPFg7fsbKXfFCThxc= +knative.dev/pkg v0.0.0-20220629132331-f4ae0aff5b9c/go.mod h1:hmwyuQ6uQlqLVEM4lJGg6LZ12gbnUQv9kH88sA5pLDg= pgregory.net/rapid v0.3.3/go.mod h1:UYpPVyjFHzYBGHIxLFoupi8vwk6rXNzRY9OMvVxFIOU= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= diff --git a/vendor/knative.dev/hack/release.sh b/vendor/knative.dev/hack/release.sh index 915a1303..0448a775 100644 --- a/vendor/knative.dev/hack/release.sh +++ b/vendor/knative.dev/hack/release.sh @@ -234,13 +234,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="$(hub_tool release | 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 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}")" [[ -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}" - echo "Branch ${RELEASE_BRANCH} is at commit ${release_branch_commit}" - if [[ "${last_release_commit}" == "${release_branch_commit}" ]]; then - echo "*** Branch ${RELEASE_BRANCH} has no new cherry-picks since release ${last_version}" + 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 + echo "*** Branch ${RELEASE_BRANCH} has no new cherry-picks (ignoring commits with [skip-dot-release]) since release ${last_version}." echo "*** No dot release will be generated, as no changes exist" exit 0 fi diff --git a/vendor/modules.txt b/vendor/modules.txt index 95634113..14a0da06 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -600,10 +600,10 @@ k8s.io/utils/integer k8s.io/utils/internal/third_party/forked/golang/net k8s.io/utils/net k8s.io/utils/trace -# knative.dev/hack v0.0.0-20220610014127-dc6c287516dc +# knative.dev/hack v0.0.0-20220629134730-e7d63651ce8f ## explicit knative.dev/hack -# knative.dev/pkg v0.0.0-20220621173822-9c5a7317fa9d +# knative.dev/pkg v0.0.0-20220629132331-f4ae0aff5b9c ## explicit knative.dev/pkg/apis knative.dev/pkg/apis/duck