github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-10 12:32:03 +00:00
Code Issues Projects Releases Wiki Activity

output current_branch name instead of HEAD in help messages

Browse Source
This commit is contained in:
Eric Paris 2015-03-27 19:01:40 -04:00
parent 2b941f4954
commit cbefaf5d65
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build/mark-new-version.sh
View File

@ -45,10 +45,10 @@ if ! git diff-files --quiet pkg/version/base.go; then
fi fi
release_branch="release-${VERSION_MAJOR}.${VERSION_MINOR}" release_branch="release-${VERSION_MAJOR}.${VERSION_MINOR}"
current_branch=$(git rev-parse --abbrev-ref HEAD)
if [[ "${VERSION_PATCH}" != "0" ]]; then if [[ "${VERSION_PATCH}" != "0" ]]; then
branch=$(git rev-parse --abbrev-ref HEAD) if [[ ${current_branch} != "${release_branch}" ]]; then
if [[ ${branch} != "${release_branch}" ]]; then
echo "!!! You are trying to tag to an existing minor release but are not on the release branch: ${release_branch}" echo "!!! You are trying to tag to an existing minor release but are not on the release branch: ${release_branch}"
exit 1 exit 1
fi fi
@ -98,11 +98,11 @@ echo ""
echo "- Push the tag:" echo "- Push the tag:"
echo " git push git@github.com:GoogleCloudPlatform/kubernetes.git v${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" echo " git push git@github.com:GoogleCloudPlatform/kubernetes.git v${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}"
if [[ "${VERSION_PATCH}" == "0" ]]; then if [[ "${VERSION_PATCH}" == "0" ]]; then
echo "- Submit HEAD as a PR to master" echo "- Submit branch: ${current_branch} as a PR to master"
echo "- Merge that PR" echo "- Merge that PR"
echo "- Push the new release branch" echo "- Push the new release branch"
echo " git push git@github.com:GoogleCloudPlatform/kubernetes.git ${release_branch}" echo " git push git@github.com:GoogleCloudPlatform/kubernetes.git ${release_branch}"
else else
echo "- Submit HEAD as a PR to ${release_branch}" echo "- Submit branch: ${current_branch} as a PR to ${release_branch}"
echo "- Merge that PR" echo "- Merge that PR"
fi fi