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

Convert last step.context stragglers.

Browse Source 
These methods are removed in an upcoming version of the recipe engine.

R=borenet@google.com

Bug: skia:
Change-Id: I2db5cc683dac35b9ce65fe1b175e9f9a6d6b5efe
Reviewed-on: https://skia-review.googlesource.com/18324
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
This commit is contained in:
Robert Iannucci 2017-05-31 19:45:05 -07:00 committed by Skia Commit-Bot
parent c5a073d031
commit baf41bd1c8
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
infra/bots/recipe_modules/flavor/gn_flavor.py
View File

@ -146,7 +146,7 @@ class GNFlavorUtils(default_flavor.DefaultFlavorUtils):
def step(self, name, cmd):
app = self.m.vars.skia_out.join(self.m.vars.configuration, cmd[0])
cmd = [app] + cmd[1:]
env = self.m.step.get_from_context('env', {})
env = self.m.context.env
clang_linux = str(self.m.vars.slave_dir.join('clang_linux'))
extra_config = self.m.vars.builder_cfg.get('extra_config', '')

2
infra/bots/recipe_modules/flavor/pdfium_flavor.py
View File

@ -43,7 +43,7 @@ class PDFiumFlavorUtils(default_flavor.DefaultFlavorUtils):
gn_args.append('pdf_use_skia=true')
env = self.m.step.get_from_context('env', {})
env = self.m.context.env
env['CHROMIUM_BUILDTOOLS_PATH'] = str(pdfium_dir.join('buildtools'))
with self.m.context(env=env):
self.m.run(

4
infra/bots/recipe_modules/infra/api.py
View File

@ -37,7 +37,7 @@ class InfraApi(recipe_api.RecipeApi):
def go_version(self):
"""Print the Go version."""
env = self.m.step.get_from_context('env', {})
env = self.m.context.env
env.update(self.go_env)
with self.m.context(env=env):
self.m.run(
@ -55,7 +55,7 @@ class InfraApi(recipe_api.RecipeApi):
This fails flakily sometimes, so perform multiple attempts.
"""
self.go_version()
env = self.m.step.get_from_context('env', {})
env = self.m.context.env
env.update(self.go_env)
with self.m.context(env=env):
self.m.run.with_retry(