Make the version number 1.20000.x if the branch name is <digit>.x or <digit>.<digit>.x
This commit is contained in:
parent
69be84aac0
commit
d1a8c098a6
1 changed files with 16 additions and 6 deletions
|
|
@ -65,10 +65,14 @@ def getGitRevision(gitrootpath, basenumber):
|
|||
|
||||
return (adjustedchangecount, revision, remoteinfo)
|
||||
|
||||
def getVersionPrefix(sourcebranch):
|
||||
# Handle:
|
||||
# origin/master
|
||||
# origin/2.0.x
|
||||
def getVersionPrefix(sourcebranch):
|
||||
print("Determining version number prefix from source branch name: {0}".format(sourcebranch))
|
||||
|
||||
defaultversionprefix = "1.30000.0."
|
||||
mastertypeversionprefix = "1.20000.0."
|
||||
splits = sourcebranch.split('/')
|
||||
if len(splits) < 1:
|
||||
print("Source branch name is invalid. Defaulting to: {0}".format(defaultversionprefix))
|
||||
|
|
@ -77,7 +81,7 @@ def getVersionPrefix(sourcebranch):
|
|||
sourcebranch = splits[-1]
|
||||
|
||||
if sourcebranch.lower().endswith("master"): # Special case
|
||||
return "1.20000.0."
|
||||
return mastertypeversionprefix
|
||||
|
||||
splits = sourcebranch.split('.')
|
||||
versionprefix = ""
|
||||
|
|
@ -86,21 +90,27 @@ def getVersionPrefix(sourcebranch):
|
|||
versionprefix = defaultversionprefix
|
||||
else:
|
||||
splitnumbercount = 0
|
||||
isIntermediateReleaseBranch = false
|
||||
for split in splits:
|
||||
if split.isdigit():
|
||||
versionprefix += split + "."
|
||||
splitnumbercount += 1
|
||||
else:
|
||||
if split == "x":
|
||||
isIntermediateReleaseBranch = true
|
||||
break
|
||||
if splitnumbercount > 2:
|
||||
break
|
||||
if splitnumbercount == 0:
|
||||
print("No leading numbers were found in source branch name so defaulting to: {0}".format(defaultversionprefix))
|
||||
versionprefix = defaultversionprefix
|
||||
elif splitnumbercount == 1:
|
||||
versionprefix += "0.0."
|
||||
elif splitnumbercount == 2:
|
||||
versionprefix += "0."
|
||||
else:
|
||||
if isIntermediateReleaseBranch:
|
||||
versionprefix = mastertypeversionprefix
|
||||
elif splitnumbercount == 1:
|
||||
versionprefix += "0.0."
|
||||
elif splitnumbercount == 2:
|
||||
versionprefix += "0."
|
||||
|
||||
print("Determined version prefix to be: {0}".format(versionprefix))
|
||||
return versionprefix
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue