Spew less when script/cibuild fails
This commit is contained in:
parent
6841801538
commit
af20c55519
1 changed files with 4 additions and 3 deletions
|
@ -16,8 +16,9 @@ def main():
|
||||||
return 'Error: Can\'t find {0}'.format(S3_CREDENTIALS_FILE)
|
return 'Error: Can\'t find {0}'.format(S3_CREDENTIALS_FILE)
|
||||||
copy_to_environment(S3_CREDENTIALS_FILE)
|
copy_to_environment(S3_CREDENTIALS_FILE)
|
||||||
|
|
||||||
run_script('bootstrap', 'https://{0}.s3.amazonaws.com/libchromiumcontent'.format(os.environ['JANKY_ARTIFACTS_S3_BUCKET']))
|
url = 'https://{0}.s3.amazonaws.com/libchromiumcontent'.format(os.environ['JANKY_ARTIFACTS_S3_BUCKET'])
|
||||||
run_script('build')
|
return (run_script('bootstrap', url) or
|
||||||
|
run_script('build'))
|
||||||
|
|
||||||
|
|
||||||
def copy_to_environment(credentials_file):
|
def copy_to_environment(credentials_file):
|
||||||
|
@ -32,7 +33,7 @@ def run_script(script, *args):
|
||||||
script = os.path.join('script', script)
|
script = os.path.join('script', script)
|
||||||
sys.stderr.write('+ {0}\n'.format(script))
|
sys.stderr.write('+ {0}\n'.format(script))
|
||||||
sys.stderr.flush()
|
sys.stderr.flush()
|
||||||
subprocess.check_call([sys.executable, script] + list(args))
|
return subprocess.call([sys.executable, script] + list(args))
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
|
|
Loading…
Reference in a new issue