diff --git a/go.mod b/go.mod index 7b0041e01..ff316d158 100644 --- a/go.mod +++ b/go.mod @@ -19,9 +19,9 @@ require ( k8s.io/client-go v0.21.4 k8s.io/code-generator v0.21.4 knative.dev/eventing v0.26.1-0.20211029100351-4de0da062efa - knative.dev/hack v0.0.0-20211028194650-b96d65a5ff5e + knative.dev/hack v0.0.0-20211101195839-11d193bf617b knative.dev/networking v0.0.0-20211029072251-c3606d9f7b38 knative.dev/pkg v0.0.0-20211028235650-5d9d300c2e40 - knative.dev/serving v0.26.1-0.20211029121451-44358cc842c6 + knative.dev/serving v0.26.1-0.20211101141423-4317e47d4207 sigs.k8s.io/yaml v1.3.0 ) diff --git a/go.sum b/go.sum index 706e67326..c69ff17de 100644 --- a/go.sum +++ b/go.sum @@ -1665,16 +1665,17 @@ k8s.io/utils v0.0.0-20210111153108-fddb29f9d009/go.mod h1:jPW/WVKK9YHAvNhRxK0md/ knative.dev/caching v0.0.0-20211029072651-f2af269b6d90/go.mod h1:5lh1DR0ZI/mCx7SRwbH5K8Vy1b0AIbxOaJlcLVx9E3o= knative.dev/eventing v0.26.1-0.20211029100351-4de0da062efa h1:RnAtkRA1UMP+NgZkorDvY5iQhJRRDEcS9Mme7WCd2Wg= knative.dev/eventing v0.26.1-0.20211029100351-4de0da062efa/go.mod h1:n0CQNBQIeUqNfjgnywUykDXVKWDSlUVG3cUoK7WHxhk= -knative.dev/hack v0.0.0-20211028194650-b96d65a5ff5e h1:0Hw2xdWYbcs2JRJnOLzAVh7APOtgro7gSno0228mnDg= knative.dev/hack v0.0.0-20211028194650-b96d65a5ff5e/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI= +knative.dev/hack v0.0.0-20211101195839-11d193bf617b h1:DaW1iliZlBAwq/I8gTqVu8UnfGxyb5yR7CDsJi5jyWk= +knative.dev/hack v0.0.0-20211101195839-11d193bf617b/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI= knative.dev/hack/schema v0.0.0-20211028194650-b96d65a5ff5e/go.mod h1:ffjwmdcrH5vN3mPhO8RrF2KfNnbHeCE2C60A+2cv3U0= knative.dev/networking v0.0.0-20211029072251-c3606d9f7b38 h1:QC9p++h3mIo8BKohO1KV1PvLLtAKxgRNUDoTZwOdMWc= knative.dev/networking v0.0.0-20211029072251-c3606d9f7b38/go.mod h1:Ehgk5lhjcXSngdOv0fQu0vPXRivhx4JtS9uEhlm4fug= knative.dev/pkg v0.0.0-20211028235650-5d9d300c2e40 h1:eOOOqcj+IHIp5te9GGZsrq6vCXUv2y5JItRT3nXHs20= knative.dev/pkg v0.0.0-20211028235650-5d9d300c2e40/go.mod h1:HyEqMTLzT2hGCisGaRMGzEE8b4Ym+7mhmVx5ygiX+fY= knative.dev/reconciler-test v0.0.0-20211029073051-cff9b538d33c/go.mod h1:PIwtS0at/rtnsNCxcZUAZUmWKKasTUYJ/w1Mk94bOdA= -knative.dev/serving v0.26.1-0.20211029121451-44358cc842c6 h1:1F3iNQQZ7N2I9GFzPkXTWMSxWU6ofm6LMQB9etLyw9c= -knative.dev/serving v0.26.1-0.20211029121451-44358cc842c6/go.mod h1:1w3kpOAeaJTtnidzEbMvjtkwNm3/QlSQFZWN1bmM/FM= +knative.dev/serving v0.26.1-0.20211101141423-4317e47d4207 h1:STF9BFwnwkMY+0MD6elSBsTNKjIABbnmOSSFVKSJ7JM= +knative.dev/serving v0.26.1-0.20211101141423-4317e47d4207/go.mod h1:1w3kpOAeaJTtnidzEbMvjtkwNm3/QlSQFZWN1bmM/FM= 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 80b035fb4..0f7c47324 100644 --- a/vendor/knative.dev/hack/release.sh +++ b/vendor/knative.dev/hack/release.sh @@ -131,10 +131,18 @@ function master_version() { echo "${tokens[0]}.${tokens[1]}" } +# Return the minor version of a release. +# For example, "v0.2.1" returns "2" +# Parameters: $1 - release version label. +function minor_version() { + local tokens=(${1//\./ }) + echo "${tokens[1]}" +} + # Return the release build number of a release. # For example, "v0.2.1" returns "1". # Parameters: $1 - release version label. -function release_build_number() { +function patch_version() { local tokens=(${1//\./ }) echo "${tokens[2]}" } @@ -171,7 +179,10 @@ function prepare_auto_release() { PUBLISH_RELEASE=1 git fetch --all || abort "error fetching branches/tags from remote" - local tags="$(git tag | cut -d 'v' -f2 | cut -d '.' -f1-2 | sort -V | uniq)" + # Support two different formats for tags + # - knative-v1.0.0 + # - v1.0.0 + local tags="$(git tag | cut -d '-' -f2 | cut -d 'v' -f2 | cut -d '.' -f1-2 | sort -V | uniq)" local branches="$( { (git branch -r | grep upstream/release-) ; (git branch | grep release-); } | cut -d '-' -f2 | sort -V | uniq)" echo "Versions released (from tags): [" "${tags}" "]" @@ -210,7 +221,10 @@ function prepare_dot_release() { git fetch --all || abort "error fetching branches/tags from remote" # List latest release local releases # don't combine with the line below, or $? will be 0 - releases="$(hub_tool release)" + # Support tags in two formats + # - knative-v1.0.0 + # - v1.0.0 + releases="$(hub_tool release | cut -d '-' -f2)" echo "Current releases are: ${releases}" [[ $? -eq 0 ]] || abort "cannot list releases" # If --release-branch passed, restrict to that release @@ -234,7 +248,9 @@ function prepare_dot_release() { [[ -n "${major_minor_version}" ]] || abort "cannot get release major/minor version" # Ensure there are new commits in the branch, otherwise we don't create a new release setup_branch - local last_release_commit="$(git rev-list -n 1 "${last_version}")" + # 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 release_branch_commit="$(git rev-list -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" @@ -246,13 +262,13 @@ function prepare_dot_release() { exit 0 fi # Create new release version number - local last_build="$(release_build_number "${last_version}")" + local last_build="$(patch_version "${last_version}")" RELEASE_VERSION="${major_minor_version}.$(( last_build + 1 ))" echo "Will create release ${RELEASE_VERSION} at commit ${release_branch_commit}" # If --release-notes not used, copy from the latest release if [[ -z "${RELEASE_NOTES}" ]]; then RELEASE_NOTES="$(mktemp)" - hub_tool release show -f "%b" "${last_version}" > "${RELEASE_NOTES}" + hub_tool release show -f "%b" "${github_tag}" > "${RELEASE_NOTES}" echo "Release notes from ${last_version} copied to ${RELEASE_NOTES}" fi } @@ -595,6 +611,8 @@ function publish_to_github() { local description="$(mktemp)" local attachments_dir="$(mktemp -d)" local commitish="" + local github_tag="knative-${TAG}" + # Copy files to a separate dir for artifact in $@; do cp ${artifact} "${attachments_dir}"/ @@ -604,8 +622,22 @@ function publish_to_github() { if [[ -n "${RELEASE_NOTES}" ]]; then cat "${RELEASE_NOTES}" >> "${description}" fi - git tag -a "${TAG}" -m "${title}" - git_push tag "${TAG}" + git tag -a "${github_tag}" -m "${title}" + git_push tag "${github_tag}" + + # Include a tag for the go module version + # + # v1.0.0 = v0.27.0 + # v1.0.1 = v0.27.1 + # v1.1.1 = v0.28.1 + # + # See: https://github.com/knative/hack/pull/97 + if [[ "$TAG" == "v1"* ]]; then + local release_minor=$(minor_version $TAG) + 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}" + fi [[ -n "${RELEASE_BRANCH}" ]] && commitish="--commitish=${RELEASE_BRANCH}" for i in {2..0}; do @@ -613,7 +645,7 @@ function publish_to_github() { ${attachments[@]} \ --file="${description}" \ "${commitish}" \ - "${TAG}" && return 0 + "${github_tag}" && return 0 if [[ "${i}" -gt 0 ]]; then echo "Error publishing the release, retrying in 15s..." sleep 15 diff --git a/vendor/modules.txt b/vendor/modules.txt index 81ecb9b11..c9aea6456 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -757,7 +757,7 @@ knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1 knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1/fake knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1beta2 knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1beta2/fake -# knative.dev/hack v0.0.0-20211028194650-b96d65a5ff5e +# knative.dev/hack v0.0.0-20211101195839-11d193bf617b ## explicit knative.dev/hack # knative.dev/networking v0.0.0-20211029072251-c3606d9f7b38 @@ -817,7 +817,7 @@ knative.dev/pkg/tracing/config knative.dev/pkg/tracing/propagation knative.dev/pkg/tracing/propagation/tracecontextb3 knative.dev/pkg/tracker -# knative.dev/serving v0.26.1-0.20211029121451-44358cc842c6 +# knative.dev/serving v0.26.1-0.20211101141423-4317e47d4207 ## explicit knative.dev/serving/pkg/apis/autoscaling knative.dev/serving/pkg/apis/autoscaling/v1alpha1