Skip to content

Commit

Permalink
Pull in latest knative.dev/hack changes which fixes our release scrip…
Browse files Browse the repository at this point in the history
…ts (#12331)
  • Loading branch information
dprotaso authored Nov 22, 2021
1 parent bf2bd8c commit 9b3a560
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 6 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ require (
k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7
k8s.io/utils v0.0.0-20210111153108-fddb29f9d009 // indirect
knative.dev/caching v0.0.0-20210914230307-0184eb914a42
knative.dev/hack v0.0.0-20211116200753-bcec9dcb9e41
knative.dev/hack v0.0.0-20211122163617-c1797116a841
knative.dev/networking v0.0.0-20210914225408-69ad45454096
knative.dev/pkg v0.0.0-20210919202233-5ae482141474
sigs.k8s.io/yaml v1.2.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1529,8 +1529,8 @@ k8s.io/utils v0.0.0-20210111153108-fddb29f9d009/go.mod h1:jPW/WVKK9YHAvNhRxK0md/
knative.dev/caching v0.0.0-20210914230307-0184eb914a42 h1:F6EdQ4iawrOVlp7QSgzcIbxa4kH7B3VouKXbiWFyNzk=
knative.dev/caching v0.0.0-20210914230307-0184eb914a42/go.mod h1:bGtv+kY2eDR7VJMUEKMzSeLhsVyoeiXrxv4RvOTb7Jw=
knative.dev/hack v0.0.0-20210806075220-815cd312d65c/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI=
knative.dev/hack v0.0.0-20211116200753-bcec9dcb9e41 h1:u2KyDeTL6RTRBZH+lCNcUuWK+TNEREZf87RaNDJczUk=
knative.dev/hack v0.0.0-20211116200753-bcec9dcb9e41/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI=
knative.dev/hack v0.0.0-20211122163617-c1797116a841 h1:Lb5qvMYVaZJc5u6TpR5Dt1sHKZMDtTyOV+mO+ThfKp8=
knative.dev/hack v0.0.0-20211122163617-c1797116a841/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI=
knative.dev/networking v0.0.0-20210914225408-69ad45454096 h1:Zo8WfetGtm4YPtex9Wo5FQbMNvTAMVuvnlZtWcZZFm0=
knative.dev/networking v0.0.0-20210914225408-69ad45454096/go.mod h1:nQnVhVss/mFwL6E52vS01Qo0j9/mHTi9UUoETx8BRF0=
knative.dev/pkg v0.0.0-20210914164111-4857ab6939e3/go.mod h1:jMSqkNMsrzuy+XR4Yr/BMy7SDVbUOl3KKB6+5MR+ZU8=
Expand Down
8 changes: 6 additions & 2 deletions vendor/knative.dev/hack/release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -606,8 +606,6 @@ function publish_to_github() {
if [[ -n "${RELEASE_NOTES}" ]]; then
cat "${RELEASE_NOTES}" >> "${description}"
fi
git tag -a "${github_tag}" -m "${title}"
git_push tag "${github_tag}"

# Include a tag for the go module version
#
Expand All @@ -621,8 +619,14 @@ function publish_to_github() {
local go_module_version="v0.$(( release_minor + 27 )).$(patch_version $TAG)"
git tag -a "${go_module_version}" -m "${title}"
git_push tag "${go_module_version}"
else
# Pre-1.0 - use the tag as the release tag
github_tag="${TAG}"
fi

git tag -a "${github_tag}" -m "${title}"
git_push tag "${github_tag}"

[[ -n "${RELEASE_BRANCH}" ]] && commitish="--commitish=${RELEASE_BRANCH}"
for i in {2..0}; do
hub_tool release create \
Expand Down
2 changes: 1 addition & 1 deletion vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1038,7 +1038,7 @@ knative.dev/caching/pkg/client/injection/informers/caching/v1alpha1/image/fake
knative.dev/caching/pkg/client/injection/informers/factory
knative.dev/caching/pkg/client/injection/informers/factory/fake
knative.dev/caching/pkg/client/listers/caching/v1alpha1
# knative.dev/hack v0.0.0-20211116200753-bcec9dcb9e41
# knative.dev/hack v0.0.0-20211122163617-c1797116a841
## explicit
knative.dev/hack
knative.dev/hack/shell
Expand Down

0 comments on commit 9b3a560

Please sign in to comment.