DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Add hotfix support to release script

Browse Source
This commit is contained in:
Jack Grigg
2017-08-30 13:02:50 +01:00
parent 02dd675a25
commit 869c9f91c4
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
zcutil/make-release.py
View File

@@ -27,6 +27,7 @@ def main(args=sys.argv[1:]):
opts.RELEASE_VERSION, opts.RELEASE_VERSION,
opts.RELEASE_PREV, opts.RELEASE_PREV,
opts.RELEASE_HEIGHT, opts.RELEASE_HEIGHT,
opts.HOTFIX,
) )
except SystemExit as e: except SystemExit as e:
logging.error(str(e)) logging.error(str(e))
@@ -44,6 +45,12 @@ def parse_args(args):
type=str, type=str,
help='Path to repository root.', help='Path to repository root.',
) )
p.add_argument(
'--hotfix',
action='store_true',
dest='HOTFIX',
help='Use if this is a hotfix release from a non-master branch.',
)
p.add_argument( p.add_argument(
'RELEASE_VERSION', 'RELEASE_VERSION',
type=Version.parse_arg, type=Version.parse_arg,
@@ -63,9 +70,9 @@ def parse_args(args):
# Top-level flow: # Top-level flow:
def main_logged(release, releaseprev, releaseheight): def main_logged(release, releaseprev, releaseheight, hotfix):
verify_releaseprev_tag(releaseprev) verify_releaseprev_tag(releaseprev)
initialize_git(release) initialize_git(release, hotfix)
patch_version_in_files(release, releaseprev) patch_version_in_files(release, releaseprev)
patch_release_height(releaseheight) patch_release_height(releaseheight)
commit('Versioning changes for {}.'.format(release.novtext)) commit('Versioning changes for {}.'.format(release.novtext))
@@ -124,16 +131,20 @@ def verify_releaseprev_tag(releaseprev):
@phase('Initializing git.') @phase('Initializing git.')
def initialize_git(release): def initialize_git(release, hotfix):
junk = sh_out('git', 'status', '--porcelain') junk = sh_out('git', 'status', '--porcelain')
if junk.strip(): if junk.strip():
raise SystemExit('There are uncommitted changes:\n' + junk) raise SystemExit('There are uncommitted changes:\n' + junk)
branch = sh_out('git', 'rev-parse', '--abbrev-ref', 'HEAD').strip() branch = sh_out('git', 'rev-parse', '--abbrev-ref', 'HEAD').strip()
if branch != 'master': if hotfix:
expected = 'hotfix-' + release.vtext
else:
expected = 'master'
if branch != expected:
raise SystemExit( raise SystemExit(
"Expected branch 'master', found branch {!r}".format( "Expected branch {!r}, found branch {!r}".format(
branch, expected, branch,
), ),
) )