From e0f7e164eed88912ee708de57da25ad05933366f Mon Sep 17 00:00:00 2001 From: recipe-roller Date: Wed, 31 May 2017 16:13:27 -0700 Subject: Roll recipe dependencies (nontrivial). This is an automated CL created by the recipe roller. This CL rolls recipe changes from upstream projects (e.g. depot_tools) into downstream projects (e.g. tools/build). Please review the expectation changes, and LGTM+CQ. More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug. depot_tools: https://crrev.com/fc1c6f4c1fac4de7647da83425f4398dde6e77ca Correct Git show's path format on Windows (manzagop@chromium.org) recipe_engine: https://crrev.com/458ce956c9d91d184e0107c5fa6b34a8267b8e9b [step_runner] run _merge_envs in simulation too. (iannucci@chromium.org) R=martiniss@chromium.org, tansell@chromium.org Recipe-Tryjob-Bypass-Reason: Autoroller Bugdroid-Send-Email: False Change-Id: Ic938b59f304189fdfb78a466e6a4a0e47f0548a6 Reviewed-on: https://skia-review.googlesource.com/18300 Commit-Queue: Eric Boren Reviewed-by: Robbie Iannucci Reviewed-by: Eric Boren --- .../ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json') diff --git a/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json b/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json index a3465d748a..efd26c38fd 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json +++ b/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json @@ -61,7 +61,7 @@ "env": { "GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "bot_update", @@ -125,7 +125,7 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, @@ -142,7 +142,7 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, "name": "gn gen" @@ -157,7 +157,7 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, "name": "ninja" @@ -222,7 +222,7 @@ ], "cwd": "[START_DIR]/swarming.client", "env": { - "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" + "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:" }, "infra_step": true, "name": "git fetch (swarming_client)" @@ -311,7 +311,7 @@ "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go/linux64" ], "env": { - "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" + "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:" }, "name": "download luci-go linux" }, @@ -327,7 +327,7 @@ "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go/mac64" ], "env": { - "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" + "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:" }, "name": "download luci-go mac" }, @@ -343,7 +343,7 @@ "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go/win64" ], "env": { - "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" + "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:" }, "name": "download luci-go win" }, -- cgit v1.2.3