diff options
author | 2017-03-21 08:20:33 -0400 | |
---|---|---|
committer | 2017-03-21 12:51:40 +0000 | |
commit | bbb24f2ab83e4799ad392be3e49168425c6555b0 (patch) | |
tree | 7ebd09fd2e1e6d45bd10193b5e369df86ae8e576 /infra/bots/recipe_modules/compile/example.expected/flutter_trybot.json | |
parent | 89150582643f1ef4893a0cdeaadf5886e5cde76d (diff) |
Followup fixes for recipe roll
Simplifying some environment madness. Nobody gets to modify default_env.
Always apply it in run.__call__(). Add depot_tools path to PATH in
default_env. Result is simpler but now default_env is applied in many
more places, which should be harmless.
BUG=skia:
Change-Id: I8299d50bde2bc3e2d47568a267d1d962a3fc3d56
Reviewed-on: https://skia-review.googlesource.com/9916
Reviewed-by: Ravi Mistry <rmistry@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
Diffstat (limited to 'infra/bots/recipe_modules/compile/example.expected/flutter_trybot.json')
-rw-r--r-- | infra/bots/recipe_modules/compile/example.expected/flutter_trybot.json | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/infra/bots/recipe_modules/compile/example.expected/flutter_trybot.json b/infra/bots/recipe_modules/compile/example.expected/flutter_trybot.json index e6aebf3e78..713791f8b2 100644 --- a/infra/bots/recipe_modules/compile/example.expected/flutter_trybot.json +++ b/infra/bots/recipe_modules/compile/example.expected/flutter_trybot.json @@ -49,12 +49,9 @@ ], "cwd": "[CUSTOM_/_B_WORK]/flutter", "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", "GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/flutter/src/third_party/skia/out/Build-Ubuntu-GCC-x86_64-Release-Flutter_Android" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "bot_update", @@ -100,6 +97,12 @@ "runhooks" ], "cwd": "[CUSTOM_/_B_WORK]/flutter/src", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_/_B_WORK]/flutter/src/third_party/skia/out/Build-Ubuntu-GCC-x86_64-Release-Flutter_Android" + }, "name": "runhook" }, { @@ -110,6 +113,7 @@ "rmtree", "[CUSTOM_/_B_WORK]/flutter/src/out/android_release" ], + "cwd": "[CUSTOM_/_B_WORK]/flutter/src", "env": { "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, @@ -122,6 +126,13 @@ "--runtime-mode=release", "--android" ], + "cwd": "[CUSTOM_/_B_WORK]/flutter/src", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_/_B_WORK]/flutter/src/third_party/skia/out/Build-Ubuntu-GCC-x86_64-Release-Flutter_Android" + }, "name": "gn_gen" }, { @@ -131,6 +142,13 @@ "out/android_release", "-j100" ], + "cwd": "[CUSTOM_/_B_WORK]/flutter/src", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_/_B_WORK]/flutter/src/third_party/skia/out/Build-Ubuntu-GCC-x86_64-Release-Flutter_Android" + }, "name": "build_flutter" }, { |