diff options
author | Eric Boren <borenet@google.com> | 2018-04-26 14:23:08 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-04-26 18:51:13 +0000 |
commit | e8615f969e92009551b70c85d1913202390e0b0d (patch) | |
tree | cdabbd4f78be6bbed4dfe6774d13b7e8f93abcc7 /infra/bots/recipes/compile.expected/alternate_repo.json | |
parent | 329694260c6d40ea3ef8fff45d67bbc5a35b1276 (diff) |
[recipes] Use named caches for git and workdirs
Bug: skia:
Change-Id: Iaf3d190252c9483c8b9e58a3ab0305db4173cc1c
Reviewed-on: https://skia-review.googlesource.com/123929
Commit-Queue: Eric Boren <borenet@google.com>
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Diffstat (limited to 'infra/bots/recipes/compile.expected/alternate_repo.json')
-rw-r--r-- | infra/bots/recipes/compile.expected/alternate_repo.json | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/infra/bots/recipes/compile.expected/alternate_repo.json b/infra/bots/recipes/compile.expected/alternate_repo.json index 1f2410ca26..570c282e5e 100644 --- a/infra/bots/recipes/compile.expected/alternate_repo.json +++ b/infra/bots/recipes/compile.expected/alternate_repo.json @@ -9,7 +9,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_C:\\_B_WORK]" + "[START_DIR]/cache/work" ], "infra_step": true, "name": "makedirs checkout_path" @@ -22,10 +22,10 @@ "--json-output", "/path/to/tmp/json", "remove", - "[CUSTOM_C:\\_B_WORK]/.gclient_entries" + "[START_DIR]/cache/work/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_C:\\_B_WORK]/.gclient_entries" + "name": "remove [START_DIR]/cache/work/.gclient_entries" }, { "cmd": [ @@ -33,13 +33,13 @@ "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", - "cache_dir = '[CUSTOM_C:\\\\_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'other_repo', 'url': 'https://skia.googlesource.com/other_repo.git'}]", + "cache_dir = '[START_DIR]/cache/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'other_repo', 'url': 'https://skia.googlesource.com/other_repo.git'}]", "--patch_root", "other_repo", "--revision_mapping_file", "{\"got_revision\": \"other_repo\"}", "--git-cache-dir", - "[CUSTOM_C:\\_B_CACHE]", + "[START_DIR]/cache/git", "--cleanup-dir", "[CLEANUP]/bot_update", "--output_json", @@ -47,7 +47,7 @@ "--revision", "other_repo@abc123" ], - "cwd": "[CUSTOM_C:\\_B_WORK]", + "cwd": "[START_DIR]/cache/work", "env_prefixes": { "PATH": [ "RECIPE_PACKAGE_REPO[depot_tools]" @@ -101,7 +101,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[CUSTOM_C:\\_B_WORK]/skia/infra/bots/assets/clang_win/VERSION", + "[START_DIR]/cache/work/skia/infra/bots/assets/clang_win/VERSION", "/path/to/tmp/" ], "infra_step": true, @@ -111,31 +111,31 @@ "cmd": [ "python", "-u", - "[CUSTOM_C:\\_B_WORK]/skia/bin/fetch-gn" + "[START_DIR]/cache/work/skia/bin/fetch-gn" ], - "cwd": "[CUSTOM_C:\\_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "<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" }, "infra_step": true, "name": "fetch-gn" }, { "cmd": [ - "[CUSTOM_C:\\_B_WORK]/skia/bin/gn.exe", + "[START_DIR]/cache/work/skia/bin/gn.exe", "gen", - "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan/Release_x64", + "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan/Release_x64", "--args=cc=\"clang\" clang_win=\"[START_DIR]/clang_win\" cxx=\"clang++\" extra_cflags=[\"-DDUMMY_clang_win_version=42\"] is_debug=false skia_enable_vulkan_debug_layers=false skia_vulkan_sdk=\"[START_DIR]/win_vulkan_sdk\" target_cpu=\"x86_64\" win_sdk=\"[START_DIR]/t/depot_tools/win_toolchain/vs_files/a9e1098bba66d2acccc377d5ee81265910f29272/win_sdk\" win_vc=\"[START_DIR]/t/depot_tools/win_toolchain/vs_files/a9e1098bba66d2acccc377d5ee81265910f29272/VC\"" ], - "cwd": "[CUSTOM_C:\\_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "<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": "gn gen" }, @@ -145,14 +145,14 @@ "-k", "0", "-C", - "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan/Release_x64" + "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan/Release_x64" ], - "cwd": "[CUSTOM_C:\\_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "<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": "ninja" }, @@ -161,7 +161,7 @@ "python", "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", - "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan/Release_x64", + "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan/Release_x64", "[START_DIR]/[SWARM_OUT_DIR]/out/Release_x64" ], "infra_step": true, |