mirror of
https://github.com/overcuriousity/autopsy-flatpak.git
synced 2025-07-17 18:17:43 +00:00
Merge pull request #480 from alexjacks92/master
Added branch information to build failure emails.
This commit is contained in:
commit
4d13c78070
@ -44,10 +44,10 @@ def compile(errore, attachli, parsedin, branch):
|
|||||||
if(passed):
|
if(passed):
|
||||||
gitPull("autopsy", branch)
|
gitPull("autopsy", branch)
|
||||||
if(passed):
|
if(passed):
|
||||||
antBuild("datamodel", False)
|
antBuild("datamodel", False, branch)
|
||||||
print("DataModel")
|
print("DataModel")
|
||||||
if(passed):
|
if(passed):
|
||||||
antBuild("autopsy", True)
|
antBuild("autopsy", True, branch)
|
||||||
print("Aut")
|
print("Aut")
|
||||||
if(passed):
|
if(passed):
|
||||||
redo = False
|
redo = False
|
||||||
@ -131,7 +131,7 @@ def vsBuild():
|
|||||||
redo = True
|
redo = True
|
||||||
|
|
||||||
#Builds Autopsy or the Datamodel
|
#Builds Autopsy or the Datamodel
|
||||||
def antBuild(which, Build):
|
def antBuild(which, Build, branch):
|
||||||
print("building: ", which)
|
print("building: ", which)
|
||||||
global redo
|
global redo
|
||||||
global passed
|
global passed
|
||||||
@ -165,14 +165,14 @@ def antBuild(which, Build):
|
|||||||
open(chk)
|
open(chk)
|
||||||
except IOError as e:
|
except IOError as e:
|
||||||
if(not tryredo):
|
if(not tryredo):
|
||||||
errorem += "DataModel Java build failed.\n"
|
errorem += "DataModel Java build failed on branch " + branch + ".\n"
|
||||||
attachl.append(antpth)
|
attachl.append(antpth)
|
||||||
if email_enabled:
|
if email_enabled:
|
||||||
Emailer.send_email(to, server, subj, errorem, attachl)
|
Emailer.send_email(to, server, subj, errorem, attachl)
|
||||||
passed = False
|
passed = False
|
||||||
tryredo = True
|
tryredo = True
|
||||||
elif (succd != 0 and (not tryredo)):
|
elif (succd != 0 and (not tryredo)):
|
||||||
errorem += "Autopsy build failed.\n"
|
errorem += "Autopsy build failed on branch " + branch + ".\n"
|
||||||
attachl.append(antpth)
|
attachl.append(antpth)
|
||||||
Emailer.send_email(to, server, subj, errorem, attachl)
|
Emailer.send_email(to, server, subj, errorem, attachl)
|
||||||
tryredo = True
|
tryredo = True
|
||||||
|
Loading…
x
Reference in New Issue
Block a user