[infra] Fixes for chrome_release_branch

Bug: skia:8932
Change-Id: Ic7414a6fdfbd8f6a822d1c4c09465843889bb885
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/209161
Reviewed-by: Heather Miller <hcm@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
This commit is contained in:
Eric Boren 2019-04-18 08:54:33 -04:00 committed by Skia Commit-Bot
parent a94670bd08
commit 06a7257b40
2 changed files with 5 additions and 2 deletions

View File

@ -79,13 +79,16 @@ def update_infra_config(old_branch, new_branch):
subprocess.check_call(['new-branch', subprocess.check_call(['new-branch',
'--branch', new_branch, '--branch', new_branch,
'--delete', old_branch, '--delete', old_branch,
'--owner', owner]) '--owner', owner,
'--exclude-trybots=chromium.*',
'--exclude-trybots=.*Android_Framework.*'])
def main(): def main():
if len(sys.argv) != 2: if len(sys.argv) != 2:
print >> sys.stderr, 'Usage: %s <commit hash for branch>' % sys.argv[0] print >> sys.stderr, 'Usage: %s <commit hash for branch>' % sys.argv[0]
sys.exit(1) sys.exit(1)
go.check()
branch_at = sys.argv[1] branch_at = sys.argv[1]
m = get_current_milestone() m = get_current_milestone()
new_branch = '%s%d' % (CHROME_REF_PREFIX, m) new_branch = '%s%d' % (CHROME_REF_PREFIX, m)

View File

@ -24,7 +24,7 @@ def check():
try: try:
go_exe = subprocess.check_output([WHICH, 'go']) go_exe = subprocess.check_output([WHICH, 'go'])
except (subprocess.CalledProcessError, OSError): except (subprocess.CalledProcessError, OSError):
pass go_exe = None
if not go_exe: if not go_exe:
_fail('Unable to find Golang installation; see ' _fail('Unable to find Golang installation; see '
'https://golang.org/doc/install') 'https://golang.org/doc/install')