diff options
author | Ben Wagner <benjaminwagner@google.com> | 2018-04-26 18:19:25 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-04-26 22:21:04 +0000 |
commit | 01d3eb64e7b11b22cf206758f01b06a7ae0bbb20 (patch) | |
tree | 2c53c65e62df6387cf77b1a33a447a47024e1b3f /infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug.json | |
parent | bf134d2283570786984f2c1630abbbc2c2e1bf09 (diff) |
Revert "[recipes] Use named caches for git and workdirs"
This reverts commit e8615f969e92009551b70c85d1913202390e0b0d.
Reason for revert: Causing CommandBuffer builds to time out
Original change's description:
> [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>
----------------
Revert "[infra] Fix missing cache for Bookmaker"
This reverts commit d19f039a16cc4ed29dc6f0ef7100125819ca291d.
Reason for revert: Need to revert https://skia-review.googlesource.com/123929
Original change's description:
> [infra] Fix missing cache for Bookmaker
>
> Bug: skia:
> Change-Id: I12d42fa1bb364ea6c75865f72143daf92b8c12c3
> Reviewed-on: https://skia-review.googlesource.com/124052
> Reviewed-by: Ben Wagner <benjaminwagner@google.com>
> Commit-Queue: Eric Boren <borenet@google.com>
----------------
Revert "Fix missing/duplicate named caches"
This reverts commit 0820a6fb697be598b41b65c7645659e216b30bc5.
Reason for revert: Need to revert https://skia-review.googlesource.com/123929
Original change's description:
> Fix missing/duplicate named caches
>
> Fixes issue with https://skia-review.googlesource.com/c/skia/+/123929
>
> No-Try: true
> Change-Id: I582b2bba67b8b257f35c5b85ccfe6e6304ff7a7c
> Reviewed-on: https://skia-review.googlesource.com/124180
> Commit-Queue: Ben Wagner <benjaminwagner@google.com>
> Auto-Submit: Ben Wagner <benjaminwagner@google.com>
> Reviewed-by: Ravi Mistry <rmistry@google.com>
----------------
TBR=borenet@google.com,benjaminwagner@google.com,rmistry@google.com
Change-Id: Id8443ad9dc50f018251a6b6892b06fe256e6c578
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/124203
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Diffstat (limited to 'infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug.json')
-rw-r--r-- | infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug.json | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug.json b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug.json index 04a40898b2..4609686176 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug.json @@ -9,7 +9,7 @@ "ensure-directory", "--mode", "0777", - "[START_DIR]/cache/work" + "[CUSTOM_/_B_WORK]" ], "infra_step": true, "name": "makedirs checkout_path" @@ -22,10 +22,10 @@ "--json-output", "/path/to/tmp/json", "remove", - "[START_DIR]/cache/work/.gclient_entries" + "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [START_DIR]/cache/work/.gclient_entries" + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ @@ -33,13 +33,13 @@ "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", - "cache_dir = '[START_DIR]/cache/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", + "cache_dir = '[CUSTOM_/_B_CACHE]'\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", - "[START_DIR]/cache/git", + "[CUSTOM_/_B_CACHE]", "--cleanup-dir", "[CLEANUP]/bot_update", "--output_json", @@ -47,7 +47,7 @@ "--revision", "skia@abc123" ], - "cwd": "[START_DIR]/cache/work", + "cwd": "[CUSTOM_/_B_WORK]", "env_prefixes": { "PATH": [ "RECIPE_PACKAGE_REPO[depot_tools]" @@ -101,7 +101,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[START_DIR]/cache/work/skia/infra/bots/assets/clang_linux/VERSION", + "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/clang_linux/VERSION", "/path/to/tmp/" ], "infra_step": true, @@ -111,31 +111,31 @@ "cmd": [ "python", "-u", - "[START_DIR]/cache/work/skia/bin/fetch-gn" + "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug" }, "infra_step": true, "name": "fetch-gn" }, { "cmd": [ - "[START_DIR]/cache/work/skia/bin/gn", + "[CUSTOM_/_B_WORK]/skia/bin/gn", "gen", - "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug/Debug", + "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug/Debug", "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-B[START_DIR]/clang_linux/bin\", \"-DDUMMY_clang_linux_version=42\", \"-O1\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\"] target_cpu=\"x86_64\"" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug" }, "name": "gn gen" }, @@ -145,14 +145,14 @@ "-k", "0", "-C", - "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug/Debug" + "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug/Debug" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug" }, "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", - "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug/Debug", + "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug/Debug", "[START_DIR]/[SWARM_OUT_DIR]/out/Debug" ], "infra_step": true, |