This gets us the default env, which includes the missing depot_tools.
NOTRY=true
Bug: skia:
Change-Id: Idc6f9c426eb88c36d8c5d9c9bf9568a9414d61a6
Reviewed-on: https://skia-review.googlesource.com/13587
Reviewed-by: Ravi Mistry <rmistry@google.com>
],
"cwd": "[CUSTOM_/_B_WORK]/src",
"env": {
+ "BUILDTYPE": "Release",
+ "CHROME_HEADLESS": "1",
"CPPFLAGS": "-DSK_ALLOW_CROSSPROCESS_PICTUREIMAGEFILTERS=1",
- "GYP_GENERATORS": "ninja"
+ "GYP_GENERATORS": "ninja",
+ "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
+ "SKIA_OUT": "[START_DIR]/out"
},
"name": "GN"
},
"chrome"
],
"cwd": "[CUSTOM_/_B_WORK]/src",
+ "env": {
+ "BUILDTYPE": "Release",
+ "CHROME_HEADLESS": "1",
+ "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
+ "SKIA_OUT": "[START_DIR]/out"
+ },
"name": "Build Chrome"
},
{
],
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {
+ "BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
- "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
+ "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
+ "SKIA_OUT": "[START_DIR]/out"
},
"name": "Recreate SKPs"
},
],
"cwd": "[CUSTOM_/_B_WORK]/src",
"env": {
+ "BUILDTYPE": "Release",
+ "CHROME_HEADLESS": "1",
"CPPFLAGS": "-DSK_ALLOW_CROSSPROCESS_PICTUREIMAGEFILTERS=1",
- "GYP_GENERATORS": "ninja"
+ "GYP_GENERATORS": "ninja",
+ "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
+ "SKIA_OUT": "[START_DIR]/out"
},
"name": "GN"
},
"chrome"
],
"cwd": "[CUSTOM_/_B_WORK]/src",
+ "env": {
+ "BUILDTYPE": "Release",
+ "CHROME_HEADLESS": "1",
+ "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
+ "SKIA_OUT": "[START_DIR]/out"
+ },
"name": "Build Chrome"
},
{
],
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {
+ "BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
- "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
+ "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
+ "SKIA_OUT": "[START_DIR]/out"
},
"name": "Recreate SKPs"
},
],
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {
+ "BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
- "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:%(PATH)s"
+ "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
+ "SKIA_OUT": "[START_DIR]/out"
},
"name": "Upload SKPs"
},
],
"cwd": "[CUSTOM_/_B_WORK]/src",
"env": {
+ "BUILDTYPE": "Release",
+ "CHROME_HEADLESS": "1",
"CPPFLAGS": "-DSK_ALLOW_CROSSPROCESS_PICTUREIMAGEFILTERS=1",
- "GYP_GENERATORS": "ninja"
+ "GYP_GENERATORS": "ninja",
+ "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
+ "SKIA_OUT": "[START_DIR]/out"
},
"name": "GN"
},
"chrome"
],
"cwd": "[CUSTOM_/_B_WORK]/src",
+ "env": {
+ "BUILDTYPE": "Release",
+ "CHROME_HEADLESS": "1",
+ "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
+ "SKIA_OUT": "[START_DIR]/out"
+ },
"name": "Build Chrome"
},
{
],
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {
+ "BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
- "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
+ "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
+ "SKIA_OUT": "[START_DIR]/out"
},
"name": "Recreate SKPs"
},
],
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {
+ "BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
- "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:%(PATH)s"
+ "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
+ "SKIA_OUT": "[START_DIR]/out"
},
"name": "Upload SKPs",
"~followup_annotations": [
'recipe_engine/step',
'core',
'infra',
+ 'run',
'vars',
]
gn_env = {'CPPFLAGS': '-DSK_ALLOW_CROSSPROCESS_PICTUREIMAGEFILTERS=1',
'GYP_GENERATORS': 'ninja'}
with api.step.context({'env': gn_env}):
- api.step('GN', [gn, 'gen', out_dir])
+ api.run(api.step, 'GN', cmd=[gn, 'gen', out_dir])
# Build Chrome.
- api.step('Build Chrome', ['ninja', '-C', out_dir, 'chrome'])
+ api.run(api.step, 'Build Chrome', cmd=['ninja', '-C', out_dir, 'chrome'])
# Clean up the output dir.
output_dir = api.path['start_dir'].join('skp_output')
api.file.makedirs('skp_output', output_dir)
# Capture the SKPs.
- path_var= api.path.pathsep.join([
- str(api.gclient._module.PACKAGE_REPO_ROOT), '%(PATH)s'])
- env = {
- 'CHROME_HEADLESS': '1',
- 'PATH': path_var,
- }
asset_dir = api.vars.infrabots_dir.join('assets', 'skp')
cmd = ['python', asset_dir.join('create.py'),
'--chrome_src_path', src_dir,
'--target_dir', output_dir]
if 'Canary' not in api.properties['buildername']:
cmd.append('--upload_to_partner_bucket')
- with api.step.context({'cwd': api.vars.skia_dir, 'env': env}):
- api.step('Recreate SKPs', cmd=cmd)
+ with api.step.context({'cwd': api.vars.skia_dir}):
+ api.run(api.step, 'Recreate SKPs', cmd=cmd)
# Upload the SKPs.
if 'Canary' not in api.properties['buildername']:
api.vars.skia_dir.join('infra', 'bots', 'upload_skps.py'),
'--target_dir', output_dir,
'--gitcookies', str(update_skps_gitcookies)]
- env.update(api.infra.go_env)
with gitcookies_auth(api, UPDATE_SKPS_KEY):
- with api.step.context({'cwd': api.vars.skia_dir, 'env': env}):
- api.step('Upload SKPs', cmd=cmd)
+ with api.step.context({'cwd': api.vars.skia_dir,
+ 'env': api.infra.go_env}):
+ api.run(api.step, 'Upload SKPs', cmd=cmd)
def GenTests(api):