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 (#12332)
  • Loading branch information
dprotaso authored Nov 22, 2021
1 parent 167fcda commit 46f4182
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 @@ -48,7 +48,7 @@ require (
k8s.io/kube-openapi v0.0.0-20210113233702-8566a335510f
k8s.io/utils v0.0.0-20210111153108-fddb29f9d009 // indirect
knative.dev/caching v0.0.0-20210803185815-4e553d2275a0
knative.dev/hack v0.0.0-20211116201252-d12abc8ca320
knative.dev/hack v0.0.0-20211122163617-23b0a901a93c
knative.dev/networking v0.0.0-20210803181815-acdfd41c575c
knative.dev/pkg v0.0.0-20210902173607-844a6bc45596
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 @@ -1611,8 +1611,8 @@ k8s.io/utils v0.0.0-20210111153108-fddb29f9d009/go.mod h1:jPW/WVKK9YHAvNhRxK0md/
knative.dev/caching v0.0.0-20210803185815-4e553d2275a0 h1:yJX4R/DntDpiHTYjbyj0EKWVzXFh47nCFS3d8Tgu+yk=
knative.dev/caching v0.0.0-20210803185815-4e553d2275a0/go.mod h1:Vs+HND39+KKaIQp9M3m3Jmt4YtznpitDQ3n53gxbDYQ=
knative.dev/hack v0.0.0-20210622141627-e28525d8d260/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI=
knative.dev/hack v0.0.0-20211116201252-d12abc8ca320 h1:0N+7MP0Dm3ExnSp7lCWoJlN6nVa2/lt2ISzrfzkRYsY=
knative.dev/hack v0.0.0-20211116201252-d12abc8ca320/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI=
knative.dev/hack v0.0.0-20211122163617-23b0a901a93c h1:xzx/fME++xSoZgmMtHXri7cai6D8HgBmRIQC7NPgKRg=
knative.dev/hack v0.0.0-20211122163617-23b0a901a93c/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI=
knative.dev/networking v0.0.0-20210803181815-acdfd41c575c h1:7G6TQr7ZyIHx35Dn5zuNKUDhlly3KkFxgrKLXeKmjj8=
knative.dev/networking v0.0.0-20210803181815-acdfd41c575c/go.mod h1:UA9m1M3rGssy63gVwjSh7CYoWTKZNO8cnY9QsIu7tyo=
knative.dev/pkg v0.0.0-20210803160015-21eb4c167cc5/go.mod h1:RPk5txNA3apR9X40D4MpUOP9/VqOG8CrtABWfOwGVS4=
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 @@ -1001,7 +1001,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-20211116201252-d12abc8ca320
# knative.dev/hack v0.0.0-20211122163617-23b0a901a93c
## explicit
knative.dev/hack
knative.dev/hack/shell
Expand Down

0 comments on commit 46f4182

Please sign in to comment.