Output git remote info into version folder

This commit is contained in:
Dan Hawkins 2017-12-01 17:03:09 +00:00
commit d347fd921f

View file

@ -59,10 +59,16 @@ def getGitRevision(gitrootpath, basenumber):
revision = completed.stdout.decode("utf-8").strip()
print("Revision: {0}".format(revision))
print("Determining remote info using git command: {0}".format(gitexecutable))
completed = subprocess.run([gitexecutable, "remote", "show", "origin"], stdout=subprocess.PIPE)
print("Command {0} returned: {1}".format(completed.args, completed.returncode))
remoteinfo = completed.stdout.decode("utf-8")
print("Remote info: {0}".format(remoteinfo))
os.chdir(cwd)
print("Restored current working directory to: {0}".format(cwd))
return (adjustedchangecount, revision)
return (adjustedchangecount, revision, remoteinfo)
def getVersionPrefix(sourcebranch):
print("Determining version number prefix from source branch name: {0}".format(sourcebranch))
@ -104,7 +110,7 @@ def getVersionPrefix(sourcebranch):
print("Determined version prefix to be: {0}".format(versionprefix))
return versionprefix
def writeversionfiles(versionfolder, buildjobname, versionprefix, gitrevision, buildnumber, buildstamp):
def writeversionfiles(versionfolder, buildjobname, versionprefix, gitrevision, remoteinfo, buildnumber, buildstamp):
with open(os.path.join(versionfolder, "buildjobname.txt"), 'w') as f:
f.write(buildjobname)
@ -114,6 +120,9 @@ def writeversionfiles(versionfolder, buildjobname, versionprefix, gitrevision, b
with open(os.path.join(versionfolder, "revision.txt"), 'w') as f:
f.write(gitrevision)
with open(os.path.join(versionfolder, "remoteinfo.txt"), 'w') as f:
f.write(remoteinfo)
with open(os.path.join(versionfolder, "buildnumber.txt"), 'w') as f:
f.write(buildnumber)
@ -157,31 +166,33 @@ USAGE
# Process arguments
args = parser.parse_args()
sourcebranch = args.sourcebranch
versionfolder = args.versionfolder
gitrootfolder = args.gitrootfolder
baseversionnumber = args.baseversionnumber
buildjobname = args.buildjobname
buildnumber = args.buildnumber
try:
sourcebranch = args.sourcebranch
versionfolder = args.versionfolder
gitrootfolder = args.gitrootfolder
baseversionnumber = args.baseversionnumber
buildjobname = args.buildjobname
buildnumber = args.buildnumber
print("Source branch:", sourcebranch, "version folder:", versionfolder, "Git root:", gitrootfolder)
print("Base version number:", baseversionnumber, "Build job name:", buildjobname, "Build number:", buildnumber)
print("Source branch:", sourcebranch, "version folder:", versionfolder, "Git root:", gitrootfolder)
print("Base version number:", baseversionnumber, "Build job name:", buildjobname, "Build number:", buildnumber)
resetFolder(versionfolder)
resetFolder(versionfolder)
(gitrevisioncount, gitrevision) = getGitRevision(gitrootfolder, baseversionnumber)
(gitrevisioncount, gitrevision, remoteinfo) = getGitRevision(gitrootfolder, baseversionnumber)
versionprefix = getVersionPrefix(sourcebranch)
versionprefix = getVersionPrefix(sourcebranch)
buildstamp = versionprefix + str(gitrevisioncount)
print("Build stamp is: {0}".format(buildstamp))
buildstamp = versionprefix + str(gitrevisioncount)
print("Build stamp is: {0}".format(buildstamp))
writeversionfiles(versionfolder, buildjobname, versionprefix, gitrevision, buildnumber, buildstamp)
writeversionfiles(versionfolder, buildjobname, versionprefix, gitrevision, remoteinfo, buildnumber, buildstamp)
return 0
except Exception as e:
print("Error while creating version info:", e.__repr__())
return 1
return 0
except Exception as e:
print("Error while creating version info:", e.__repr__())
return 1
except Exception as e:
indent = len(program_name) * " "
print(program_name + ": " + repr(e) + "\n")