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

Merge pull request #6176 from eparis/release-branch-cleanup

Browse Source 
update instructions to make it clear to get review
This commit is contained in:
Victor Marmol 2015-03-30 12:56:39 -07:00
commit e83272260d
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -109,22 +109,24 @@ echo "+++ Committing version change"
git add "${VERSION_FILE}" git add "${VERSION_FILE}"
git commit -m "Kubernetes version ${NEW_VERSION}-dev" git commit -m "Kubernetes version ${NEW_VERSION}-dev"
if [[ "${VERSION_PATCH}" == "0" ]]; then
echo "+++ Creating release branch"
git branch "${release_branch}"
fi
echo "" echo ""
echo "Success you must now:" echo "Success you must now:"
echo "" 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}"
echo " - Please note you are pushing the tag live BEFORE your PRs."
echo " You need this so the builds pick up the right tag info."
echo " If something goes wrong further down please fix the tag!"
echo " Either delete this tag and give up, fix the tag before your next PR,"
echo " or find someone who can help solve the tag problem!"
echo ""
if [[ "${VERSION_PATCH}" == "0" ]]; then if [[ "${VERSION_PATCH}" == "0" ]]; then
echo "- Submit branch: ${current_branch} as a PR to master" echo "- Submit branch: ${current_branch} as a PR to master"
echo "- Merge that PR" echo "- Get someone to review and 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 ${current_branch}:${release_branch}"
else else
echo "- Submit branch: ${current_branch} as a PR to ${release_branch}" echo "- Submit branch: ${current_branch} as a PR to ${release_branch}"
echo "- Merge that PR" echo "- Get someone to review and merge that PR"
fi fi