aboutsummaryrefslogtreecommitdiffhomepage
path: root/infra/bots/recipe_modules
diff options
context:
space:
mode:
authorGravatar Eric Boren <borenet@google.com>2018-05-15 15:37:38 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-05-16 12:56:54 +0000
commitf3a21d0540819d22ad5449721144987f51bbca91 (patch)
tree981446019d75e5bf85fa9b1ff1bc620ff6a07b5a /infra/bots/recipe_modules
parent6ee268de1238a95cd2448798ba7517ee9863a7c1 (diff)
[recipes] Move 'gclient runhooks' from flutter build to core
Bug: skia:6473 Change-Id: I89b384668a6a45eaae9995ad8f7b404a1b7f9824 Reviewed-on: https://skia-review.googlesource.com/128318 Reviewed-by: Ben Wagner <benjaminwagner@google.com> Commit-Queue: Eric Boren <borenet@google.com>
Diffstat (limited to 'infra/bots/recipe_modules')
-rw-r--r--infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-GCC-x86_64-Release-Flutter_Android.json13
-rw-r--r--infra/bots/recipe_modules/build/flutter.py3
-rw-r--r--infra/bots/recipe_modules/core/api.py2
-rw-r--r--infra/bots/recipe_modules/core/examples/full.expected/flutter_trybot.json14
4 files changed, 15 insertions, 17 deletions
diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-GCC-x86_64-Release-Flutter_Android.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-GCC-x86_64-Release-Flutter_Android.json
index a79f3f1a22..3be7441907 100644
--- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-GCC-x86_64-Release-Flutter_Android.json
+++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-GCC-x86_64-Release-Flutter_Android.json
@@ -3,19 +3,6 @@
"cmd": [
"python",
"-u",
- "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
- "runhooks"
- ],
- "cwd": "[START_DIR]/cache/work/flutter/src",
- "env": {
- "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
- },
- "name": "gclient runhooks"
- },
- {
- "cmd": [
- "python",
- "-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
diff --git a/infra/bots/recipe_modules/build/flutter.py b/infra/bots/recipe_modules/build/flutter.py
index 13403cd203..fee92c1621 100644
--- a/infra/bots/recipe_modules/build/flutter.py
+++ b/infra/bots/recipe_modules/build/flutter.py
@@ -10,9 +10,6 @@ def compile_fn(api, _):
out_dir = configuration
with api.context(cwd=flutter_dir):
- # Runhook to generate the gn binary in buildtools.
- api.gclient.runhooks()
-
# Setup GN args.
gn_args = [
'--runtime-mode=%s' % configuration,
diff --git a/infra/bots/recipe_modules/core/api.py b/infra/bots/recipe_modules/core/api.py
index 38f261dacf..bb1202814c 100644
--- a/infra/bots/recipe_modules/core/api.py
+++ b/infra/bots/recipe_modules/core/api.py
@@ -131,7 +131,7 @@ class SkiaApi(recipe_api.RecipeApi):
self.m.vars.got_revision = (
update_step.presentation.properties['got_revision'])
- if self.m.vars.need_chromium_checkout:
+ if self.m.vars.need_chromium_checkout or self.m.vars.need_flutter_checkout:
with self.m.context(cwd=self.m.vars.checkout_root,
env=self.m.vars.gclient_env):
self.m.gclient.runhooks()
diff --git a/infra/bots/recipe_modules/core/examples/full.expected/flutter_trybot.json b/infra/bots/recipe_modules/core/examples/full.expected/flutter_trybot.json
index 33a1934e45..85cbb107ab 100644
--- a/infra/bots/recipe_modules/core/examples/full.expected/flutter_trybot.json
+++ b/infra/bots/recipe_modules/core/examples/full.expected/flutter_trybot.json
@@ -118,6 +118,20 @@
"cmd": [
"python",
"-u",
+ "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
+ "runhooks"
+ ],
+ "cwd": "[START_DIR]/cache/work/flutter",
+ "env": {
+ "DEPOT_TOOLS_UPDATE": "0",
+ "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
+ },
+ "name": "gclient runhooks"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",