From ac883620fe065ba94f46c2e6856843582c869671 Mon Sep 17 00:00:00 2001 From: knative-automation Date: Thu, 30 Jun 2022 10:30:30 -0400 Subject: [PATCH] upgrade to latest dependencies (#5068) bumping knative.dev/hack 12d3e2a...e7d6365: > e7d6365 Add [skip-dot-release] feature (# 189) > 33ce6af Update community files (# 190) > dc6c287 Update community files (# 185) > fd240e2 Update community files (# 184) > 40350b6 Update community files (# 183) > 674c2b3 Update community files (# 182) > 0c389ad Update community files (# 181) > bafe4b1 Update community files (# 180) Signed-off-by: Knative Automation --- go.mod | 2 +- go.sum | 4 ++-- vendor/knative.dev/hack/release.sh | 10 ++++++---- vendor/modules.txt | 2 +- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index 895169f6a..04887d4b1 100644 --- a/go.mod +++ b/go.mod @@ -28,7 +28,7 @@ require ( gopkg.in/go-playground/webhooks.v3 v3.13.0 gopkg.in/yaml.v2 v2.3.0 honnef.co/go/tools v0.0.1-2020.1.5 // indirect - knative.dev/hack v0.0.0-20220524153203-12d3e2a7addc + knative.dev/hack v0.0.0-20220629134730-e7d63651ce8f ) replace go.opencensus.io => go.opencensus.io v0.20.2 diff --git a/go.sum b/go.sum index fa3e27253..39fbc183b 100644 --- a/go.sum +++ b/go.sum @@ -538,8 +538,8 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.5 h1:nI5egYTGJakVyOryqLs1cQO5dO0ksin5XXs2pspk75k= honnef.co/go/tools v0.0.1-2020.1.5/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -knative.dev/hack v0.0.0-20220524153203-12d3e2a7addc h1:gqxyFRgwJDioT4DmRYezz6z2j/wvFZVUbl6c9KeMj6I= -knative.dev/hack v0.0.0-20220524153203-12d3e2a7addc/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI= +knative.dev/hack v0.0.0-20220629134730-e7d63651ce8f h1:FwQQcK4wqx53DYnwFNbmixKaAks0328Ys4qwF8nzQew= +knative.dev/hack v0.0.0-20220629134730-e7d63651ce8f/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI= 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= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= diff --git a/vendor/knative.dev/hack/release.sh b/vendor/knative.dev/hack/release.sh index 915a13035..0448a7752 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 f3063d4ca..d8df66ad6 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -286,7 +286,7 @@ gopkg.in/go-playground/webhooks.v3/github gopkg.in/yaml.v2 # honnef.co/go/tools v0.0.1-2020.1.5 ## explicit -# knative.dev/hack v0.0.0-20220524153203-12d3e2a7addc +# knative.dev/hack v0.0.0-20220629134730-e7d63651ce8f ## explicit knative.dev/hack # go.opencensus.io => go.opencensus.io v0.20.2