AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add tip on patching to G3 bot

Browse Source 
NoTry: true
Change-Id: Iafb020592e22cacbbf6a79f8e8dab2fb4c4546f5
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/220520
Reviewed-by: Herb Derby <herb@google.com>
Commit-Queue: Ravi Mistry <rmistry@google.com>
This commit is contained in:
Ravi Mistry 2019-06-12 14:39:35 -04:00 committed by Skia Commit-Bot
parent 3f593799da
commit 4ba62b5ff3
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
infra/bots/g3_compile/trigger_wait_g3_task.py
View File

@ -44,6 +44,11 @@ MERGE_CONFLICT_ERROR_MSG = (
'G3 tryjob failed because the change is causing a merge conflict when \n'
'applying it to the Skia hash in G3.\n'
)
PATCHING_INFORMATION = (
'\n\n'
'Tip: If needed, could try patching in the CL into a local G3 client \n'
'with "g4 patch" and then hacking on it.'
)
class G3CompileException(Exception):
@ -159,7 +164,8 @@ def trigger_and_wait(options):
elif ret['status'] == 'merge_conflict':
raise G3CompileException(MERGE_CONFLICT_ERROR_MSG)
elif ret['status'] == 'failure':
raise G3CompileException('\n\nRun failed G3 TAP: cl/%s' % ret['cl'])
raise G3CompileException(
'\n\nRun failed G3 TAP: cl/%s' % ret['cl'] + PATCHING_INFORMATION)
elif ret['status'] == 'success':
print '\n\nRun passed G3 TAP: cl/%s' % ret['cl']
return 0