diff options
| author |  Eric Boren <borenet@google.com> | 2017-04-06 13:28:16 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-04-06 18:21:11 +0000 |
| commit | 2e2b27fcc1505e23453b773e1de081fc7aa589e9 (patch) | |
| tree | 40b9d9a93353ea71ac9e3a121986633ef38ab3e1 /infra/bots/recipes/bundle_recipes.expected | |
| parent | 60cd57ed9fac7806ca6881b9ba9c810ebaebe747 (diff) | |
Commit the patch before bundling recipes
This was part of https://skia-review.googlesource.com/c/11340/ but split
out before relanding.
Bug: skia:5813
Change-Id: I5cc97a588300a8656989a8d73e1231bdd606ef39
Reviewed-on: https://skia-review.googlesource.com/11483
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
Diffstat (limited to 'infra/bots/recipes/bundle_recipes.expected')
| -rw-r--r-- | infra/bots/recipes/bundle_recipes.expected/BundleRecipes.json | 34 |
1 files changed, 24 insertions, 10 deletions
diff --git a/infra/bots/recipes/bundle_recipes.expected/BundleRecipes.json b/infra/bots/recipes/bundle_recipes.expected/BundleRecipes.json index a4c191417a..4ecab712b7 100644 --- a/infra/bots/recipes/bundle_recipes.expected/BundleRecipes.json +++ b/infra/bots/recipes/bundle_recipes.expected/BundleRecipes.json @@ -35,6 +35,10 @@ "{\"skia\": \"got_revision\"}", "--git-cache-dir", "[CUSTOM_/_B_CACHE]", + "--issue", + "10101", + "--patchset", + "3", "--output_json", "/path/to/tmp/json", "--revision", @@ -78,10 +82,13 @@ }, { "cmd": [ - "python", - "[CUSTOM_/_B_WORK]/skia/infra/bots/recipes.py", - "bundle" + "git", + "commit", + "-a", + "-m", + "Commit Patch" ], + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", @@ -89,18 +96,25 @@ "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, - "name": "Bundle Recipes" + "name": "Commit Patch" }, { "cmd": [ "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", - "[START_DIR]/bundle", - "[CUSTOM_[SWARM_OUT_DIR]]/recipe_bundle", - "0" + "[CUSTOM_/_B_WORK]/skia/infra/bots/recipes.py", + "bundle", + "--destination", + "[CUSTOM_[SWARM_OUT_DIR]]/recipe_bundle" ], - "name": "Copy Recipe Bundle" + "cwd": "[CUSTOM_/_B_WORK]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, + "infra_step": true, + "name": "Bundle Recipes" }, { "name": "$result", |