root
/
kafka
mirror of https://github.com/apache/kafka.git
1
0
Fork 0
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Store original starting branch to switch back to instead of using a default.

This commit is contained in:
Ewen Cheslack-Postava 2017-05-03 09:32:20 -07:00
parent b793562d7d
commit ff0b330070
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
release.py
View File

@ -45,7 +45,6 @@ CAPITALIZED_PROJECT_NAME = "kafka".upper()
REPO_HOME = os.environ.get("%s_HOME" % CAPITALIZED_PROJECT_NAME, os.getcwd()) REPO_HOME = os.environ.get("%s_HOME" % CAPITALIZED_PROJECT_NAME, os.getcwd())
# Remote name which points to Apache git # Remote name which points to Apache git
PUSH_REMOTE_NAME = os.environ.get("PUSH_REMOTE_NAME", "apache") PUSH_REMOTE_NAME = os.environ.get("PUSH_REMOTE_NAME", "apache")
DEV_BRANCH_NAME = "trunk"
delete_gitrefs = False delete_gitrefs = False
work_dir = None work_dir = None
@ -145,6 +144,8 @@ Do you have all of of these setup? (y/n): """):
fail("Please try again once you have all the prerequisites ready.") fail("Please try again once you have all the prerequisites ready.")
starting_branch = cmd_output('git rev-parse --abbrev-ref HEAD')
release_version = raw_input("Release version (without any RC info, e.g. 0.10.2.0): ") release_version = raw_input("Release version (without any RC info, e.g. 0.10.2.0): ")
try: try:
release_version_parts = release_version.split('.') release_version_parts = release_version.split('.')
@ -222,7 +223,7 @@ cmd("Commiting version number updates", ["git", "commit", "-a", "-m", "Bump vers
# Command in explicit list due to messages with spaces # Command in explicit list due to messages with spaces
cmd("Tagging release candidate %s" % rc_tag, ["git", "tag", "-a", rc_tag, "-m", rc_tag]) cmd("Tagging release candidate %s" % rc_tag, ["git", "tag", "-a", rc_tag, "-m", rc_tag])
rc_githash = cmd_output("git show-ref --hash " + rc_tag) rc_githash = cmd_output("git show-ref --hash " + rc_tag)
cmd("Switching back to dev branch", "git checkout %s" % DEV_BRANCH_NAME) cmd("Switching back to your starting branch", "git checkout %s" % starting_branch)
# Note that we don't use tempfile here because mkdtemp causes problems with sftp and being able to determine the absolute path to a file. # Note that we don't use tempfile here because mkdtemp causes problems with sftp and being able to determine the absolute path to a file.
# Instead we rely on a fixed path and if it # Instead we rely on a fixed path and if it