From 5cb5c74efdac46a1f9af37ff9707bc9d2c900083 Mon Sep 17 00:00:00 2001 From: Eric Boren Date: Fri, 27 Apr 2018 13:14:38 -0400 Subject: Reland "[recipes] Use named caches for git and workdirs" This reverts commit 01d3eb64e7b11b22cf206758f01b06a7ae0bbb20. Bug: skia: Change-Id: Ic05b89009eb59a231488bef382dd232a50d2b00f Reviewed-on: https://skia-review.googlesource.com/124260 Reviewed-by: Ben Wagner Commit-Queue: Eric Boren --- .../run/examples/full.expected/test.json | 40 +++++++++++----------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'infra/bots/recipe_modules/run/examples/full.expected') diff --git a/infra/bots/recipe_modules/run/examples/full.expected/test.json b/infra/bots/recipe_modules/run/examples/full.expected/test.json index e183a110cc..0d4e279414 100644 --- a/infra/bots/recipe_modules/run/examples/full.expected/test.json +++ b/infra/bots/recipe_modules/run/examples/full.expected/test.json @@ -7,7 +7,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, "name": "fail", "~followup_annotations": [ @@ -23,7 +23,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, "name": "fail again", "~followup_annotations": [ @@ -40,7 +40,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, "name": "do a thing" }, @@ -53,7 +53,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, "name": "run 0" }, @@ -106,7 +106,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[CUSTOM_C:\\_B_WORK]/skia/infra/bots/assets/my_asset/VERSION", + "[START_DIR]/cache/work/skia/infra/bots/assets/my_asset/VERSION", "/path/to/tmp/" ], "infra_step": true, @@ -120,7 +120,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "mydir::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, "name": "env" }, @@ -170,7 +170,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, "name": "retry fail", "~followup_annotations": [ @@ -187,7 +187,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, "name": "between_attempts #1" }, @@ -199,7 +199,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, "name": "retry fail (attempt 2)", "~followup_annotations": [ @@ -216,7 +216,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, "name": "between_attempts #2" }, @@ -228,7 +228,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, "name": "retry fail (attempt 3)", "~followup_annotations": [ @@ -245,7 +245,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, "name": "between_attempts #3" }, @@ -257,7 +257,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, "name": "retry fail (attempt 4)", "~followup_annotations": [ @@ -274,7 +274,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, "name": "between_attempts #4" }, @@ -286,7 +286,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, "name": "retry fail (attempt 5)", "~followup_annotations": [ @@ -302,7 +302,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, "name": "retry success", "~followup_annotations": [ @@ -319,7 +319,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, "name": "between_attempts #1 (2)" }, @@ -331,7 +331,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, "name": "retry success (attempt 2)", "~followup_annotations": [ @@ -348,7 +348,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, "name": "between_attempts #2 (2)" }, @@ -360,7 +360,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, "name": "retry success (attempt 3)" }, -- cgit v1.2.3