diff options
author | 2018-04-27 13:14:38 -0400 | |
---|---|---|
committer | 2018-04-27 18:18:48 +0000 | |
commit | 5cb5c74efdac46a1f9af37ff9707bc9d2c900083 (patch) | |
tree | b524e7c406c3be46682c55592bde1e1bf8722342 /infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-ANGLE.json | |
parent | f80989f5f08dcb78881daebdc22b306f82f4f17b (diff) |
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 <benjaminwagner@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
Diffstat (limited to 'infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-ANGLE.json')
-rw-r--r-- | infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-ANGLE.json | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-ANGLE.json b/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-ANGLE.json index 28197f8e70..2ddf353a64 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-ANGLE.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-ANGLE.json @@ -9,7 +9,7 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_/_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_/_B_WORK]/.gclient_entries" + "[START_DIR]/cache/work/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_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_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", + "cache_dir = '[START_DIR]/cache/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", "--revision_mapping_file", "{\"got_revision\": \"skia\"}", "--git-cache-dir", - "[CUSTOM_/_B_CACHE]", + "[START_DIR]/cache/git", "--cleanup-dir", "[CLEANUP]/bot_update", "--output_json", @@ -47,7 +47,7 @@ "--revision", "skia@abc123" ], - "cwd": "[CUSTOM_/_B_WORK]", + "cwd": "[START_DIR]/cache/work", "env_prefixes": { "PATH": [ "RECIPE_PACKAGE_REPO[depot_tools]" @@ -97,31 +97,31 @@ "cmd": [ "python", "-u", - "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" + "[START_DIR]/cache/work/skia/bin/fetch-gn" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-x86_64-Release-ANGLE" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86_64-Release-ANGLE" }, "infra_step": true, "name": "fetch-gn" }, { "cmd": [ - "[CUSTOM_/_B_WORK]/skia/bin/gn", + "[START_DIR]/cache/work/skia/bin/gn", "gen", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-x86_64-Release-ANGLE/Release", + "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86_64-Release-ANGLE/Release", "--args=cc=\"gcc\" cxx=\"g++\" is_debug=false skia_use_angle=true target_cpu=\"x86_64\"" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-x86_64-Release-ANGLE" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86_64-Release-ANGLE" }, "name": "gn gen" }, @@ -131,14 +131,14 @@ "-k", "0", "-C", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-x86_64-Release-ANGLE/Release" + "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86_64-Release-ANGLE/Release" ], - "cwd": "[CUSTOM_/_B_WORK]/skia", + "cwd": "[START_DIR]/cache/work/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-x86_64-Release-ANGLE" + "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86_64-Release-ANGLE" }, "name": "ninja" }, @@ -147,7 +147,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_/_B_WORK]/skia/out/Build-Debian9-GCC-x86_64-Release-ANGLE/Release", + "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86_64-Release-ANGLE/Release", "[START_DIR]/[SWARM_OUT_DIR]/out/Release" ], "infra_step": true, |