A few more fixups

This commit is contained in:
Isaac Hollander McCreery 2015-10-29 16:06:55 -07:00
parent 235aaf73c4
commit 612158b319
2 changed files with 11 additions and 11 deletions

View File

@ -88,7 +88,7 @@ ln -s ${KUBE_BUILD_DIR}/_output/release-tars/kubernetes.tar.gz ${KUBE_BUILD_DIR}
MD5=$(md5 "${KUBE_BUILD_DIR}/kubernetes.tar.gz") MD5=$(md5 "${KUBE_BUILD_DIR}/kubernetes.tar.gz")
SHA1=$(sha1 "${KUBE_BUILD_DIR}/kubernetes.tar.gz") SHA1=$(sha1 "${KUBE_BUILD_DIR}/kubernetes.tar.gz")
echo <<- EOM cat <<- EOM
Success! You must now do the following: (you may want to cut Success! You must now do the following: (you may want to cut
and paste these instructions elsewhere, step 1 can be spammy) and paste these instructions elsewhere, step 1 can be spammy)

View File

@ -187,12 +187,12 @@ function alpha-release() {
- Finish the ${alpha_version} release build: - Finish the ${alpha_version} release build:
- From this directory (clone of upstream/master), - From this directory (clone of upstream/master),
./release/build-official-release.sh ${alpha_version} ./release/build-official-release.sh ${alpha_version}
- Figure out what the PR numbers for this release and last release are, and - Prep release notes:
get an api-token from GitHub (https://github.com/settings/tokens). From a - Figure out what the PR numbers for this release and last release are, and
clone of kubernetes/contrib at upstream/master, get an api-token from GitHub (https://github.com/settings/tokens). From a
go run release-notes/release-notes.go --last-release-pr=<number> --current-release-pr=<number> --api-token=<token> clone of kubernetes/contrib at upstream/master,
Feel free to prune, but typically for patch releases we tend to include go run release-notes/release-notes.go --last-release-pr=<number> --current-release-pr=<number> --api-token=<token>
everything in the release notes. Feel free to prune.
EOM EOM
} }
@ -226,12 +226,12 @@ function official-release() {
git-push "${official_version}" git-push "${official_version}"
cat >> "${INSTRUCTIONS}" <<- EOM cat >> "${INSTRUCTIONS}" <<- EOM
- Finish the ${version} release build: - Finish the ${official_version} release build:
- From this directory (clone of upstream/master), - From this directory (clone of upstream/master),
./release/build-official-release.sh ${version} ./release/build-official-release.sh ${official_version}
- Prep release notes: - Prep release notes:
- From this directory (clone of upstream/master), run - From this directory (clone of upstream/master), run
./hack/cherry_pick_list.sh ${version} ./hack/cherry_pick_list.sh ${official_version}
to get the release notes for the patch release you just created. Feel to get the release notes for the patch release you just created. Feel
free to prune anything internal, but typically for patch releases we tend free to prune anything internal, but typically for patch releases we tend
to include everything in the release notes. to include everything in the release notes.
@ -245,7 +245,7 @@ function verify-at-git-commit() {
local -r git_commit="${1}" local -r git_commit="${1}"
echo "Verifying we are at ${git_commit}." echo "Verifying we are at ${git_commit}."
if [[ $(current-git-commit) != ${git_commit} ]]; then if [[ $(current-git-commit) != ${git_commit} ]]; then
echo <<- EOM cat <<- EOM
!!! We are not at commit ${git_commit}! (If you're cutting an official release, !!! We are not at commit ${git_commit}! (If you're cutting an official release,
that probably means your release branch isn't frozen, so the commit you want to that probably means your release branch isn't frozen, so the commit you want to
release isn't at HEAD of the release branch.)" release isn't at HEAD of the release branch.)"