01d3eb64e7
This reverts commite8615f969e. 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 commitd19f039a16. 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 commit0820a6fb69. 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>
227 lines
9.3 KiB
JSON
227 lines
9.3 KiB
JSON
[
|
|
{
|
|
"cmd": [
|
|
"python",
|
|
"-u",
|
|
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
|
|
"--json-output",
|
|
"/path/to/tmp/json",
|
|
"ensure-directory",
|
|
"--mode",
|
|
"0777",
|
|
"[CUSTOM_/_B_WORK]"
|
|
],
|
|
"infra_step": true,
|
|
"name": "makedirs checkout_path"
|
|
},
|
|
{
|
|
"cmd": [
|
|
"python",
|
|
"-u",
|
|
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
|
|
"--json-output",
|
|
"/path/to/tmp/json",
|
|
"remove",
|
|
"[CUSTOM_/_B_WORK]/.gclient_entries"
|
|
],
|
|
"infra_step": true,
|
|
"name": "remove [CUSTOM_/_B_WORK]/.gclient_entries"
|
|
},
|
|
{
|
|
"cmd": [
|
|
"python",
|
|
"-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'}, {'deps_file': '.DEPS.git', 'managed': False, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]",
|
|
"--patch_root",
|
|
"skia",
|
|
"--revision_mapping_file",
|
|
"{\"got_revision\": \"skia\"}",
|
|
"--git-cache-dir",
|
|
"[CUSTOM_/_B_CACHE]",
|
|
"--cleanup-dir",
|
|
"[CLEANUP]/bot_update",
|
|
"--output_json",
|
|
"/path/to/tmp/json",
|
|
"--revision",
|
|
"skia@abc123",
|
|
"--revision",
|
|
"src@origin/lkcr"
|
|
],
|
|
"cwd": "[CUSTOM_/_B_WORK]",
|
|
"env_prefixes": {
|
|
"PATH": [
|
|
"RECIPE_PACKAGE_REPO[depot_tools]"
|
|
]
|
|
},
|
|
"infra_step": true,
|
|
"name": "bot_update",
|
|
"~followup_annotations": [
|
|
"@@@STEP_TEXT@Some step text@@@",
|
|
"@@@STEP_LOG_LINE@json.output@{@@@",
|
|
"@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@",
|
|
"@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
|
|
"@@@STEP_LOG_LINE@json.output@ \"skia\": \"abc123\", @@@",
|
|
"@@@STEP_LOG_LINE@json.output@ \"src\": \"origin/lkcr\"@@@",
|
|
"@@@STEP_LOG_LINE@json.output@ }, @@@",
|
|
"@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
|
|
"@@@STEP_LOG_LINE@json.output@ \"skia\": {@@@",
|
|
"@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/skia.git\", @@@",
|
|
"@@@STEP_LOG_LINE@json.output@ \"revision\": \"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@",
|
|
"@@@STEP_LOG_LINE@json.output@ }@@@",
|
|
"@@@STEP_LOG_LINE@json.output@ }, @@@",
|
|
"@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@",
|
|
"@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"skia\", @@@",
|
|
"@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
|
|
"@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"9046e2e693bb92a76e972b694580e5d17ad10748\", @@@",
|
|
"@@@STEP_LOG_LINE@json.output@ \"got_revision_cp\": \"refs/heads/master@{#164710}\"@@@",
|
|
"@@@STEP_LOG_LINE@json.output@ }, @@@",
|
|
"@@@STEP_LOG_LINE@json.output@ \"root\": \"skia\", @@@",
|
|
"@@@STEP_LOG_LINE@json.output@ \"source_manifest\": {@@@",
|
|
"@@@STEP_LOG_LINE@json.output@ \"directories\": {@@@",
|
|
"@@@STEP_LOG_LINE@json.output@ \"skia\": {@@@",
|
|
"@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@",
|
|
"@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/skia.git\", @@@",
|
|
"@@@STEP_LOG_LINE@json.output@ \"revision\": \"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@",
|
|
"@@@STEP_LOG_LINE@json.output@ }@@@",
|
|
"@@@STEP_LOG_LINE@json.output@ }@@@",
|
|
"@@@STEP_LOG_LINE@json.output@ }, @@@",
|
|
"@@@STEP_LOG_LINE@json.output@ \"version\": 0@@@",
|
|
"@@@STEP_LOG_LINE@json.output@ }, @@@",
|
|
"@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@",
|
|
"@@@STEP_LOG_LINE@json.output@}@@@",
|
|
"@@@STEP_LOG_END@json.output@@@",
|
|
"@@@SET_BUILD_PROPERTY@got_revision@\"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@",
|
|
"@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#164710}\"@@@"
|
|
]
|
|
},
|
|
{
|
|
"cmd": [
|
|
"python",
|
|
"-u",
|
|
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
|
|
"runhooks"
|
|
],
|
|
"cwd": "[CUSTOM_/_B_WORK]",
|
|
"env": {
|
|
"DEPOT_TOOLS_UPDATE": "0",
|
|
"GYP_CHROMIUM_NO_ACTION": "0",
|
|
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
|
|
},
|
|
"name": "gclient runhooks"
|
|
},
|
|
{
|
|
"cmd": [
|
|
"python",
|
|
"-u",
|
|
"[CUSTOM_/_B_WORK]/skia/tools/build_command_buffer.py",
|
|
"--chrome-dir",
|
|
"[CUSTOM_/_B_WORK]",
|
|
"--output-dir",
|
|
"[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer/Debug",
|
|
"--no-sync",
|
|
"--no-hooks",
|
|
"--make-output-dir"
|
|
],
|
|
"env": {
|
|
"BUILDTYPE": "Debug",
|
|
"CHROME_HEADLESS": "1",
|
|
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
|
|
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer"
|
|
},
|
|
"name": "build command_buffer"
|
|
},
|
|
{
|
|
"cmd": [
|
|
"python",
|
|
"-u",
|
|
"[CUSTOM_/_B_WORK]/skia/bin/fetch-gn"
|
|
],
|
|
"cwd": "[CUSTOM_/_B_WORK]/skia",
|
|
"env": {
|
|
"BUILDTYPE": "Debug",
|
|
"CHROME_HEADLESS": "1",
|
|
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
|
|
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer"
|
|
},
|
|
"infra_step": true,
|
|
"name": "fetch-gn"
|
|
},
|
|
{
|
|
"cmd": [
|
|
"[CUSTOM_/_B_WORK]/skia/bin/gn",
|
|
"gen",
|
|
"[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer/Debug",
|
|
"--args=cc=\"clang\" cxx=\"clang++\" extra_cflags=[\"-O1\"] target_cpu=\"x86_64\""
|
|
],
|
|
"cwd": "[CUSTOM_/_B_WORK]/skia",
|
|
"env": {
|
|
"BUILDTYPE": "Debug",
|
|
"CHROME_HEADLESS": "1",
|
|
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
|
|
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer"
|
|
},
|
|
"name": "gn gen"
|
|
},
|
|
{
|
|
"cmd": [
|
|
"ninja",
|
|
"-k",
|
|
"0",
|
|
"-C",
|
|
"[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer/Debug"
|
|
],
|
|
"cwd": "[CUSTOM_/_B_WORK]/skia",
|
|
"env": {
|
|
"BUILDTYPE": "Debug",
|
|
"CHROME_HEADLESS": "1",
|
|
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
|
|
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer"
|
|
},
|
|
"name": "ninja"
|
|
},
|
|
{
|
|
"cmd": [
|
|
"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-Mac-Clang-x86_64-Debug-CommandBuffer/Debug",
|
|
"[START_DIR]/[SWARM_OUT_DIR]/out/Debug"
|
|
],
|
|
"infra_step": true,
|
|
"name": "copy build products",
|
|
"~followup_annotations": [
|
|
"@@@STEP_LOG_LINE@python.inline@import errno@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@import glob@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@import os@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@import shutil@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@import sys@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@src = sys.argv[1]@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@dst = sys.argv[2]@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@build_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']@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@try:@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@ os.makedirs(dst)@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@except OSError as e:@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@ if e.errno != errno.EEXIST:@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@ raise@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@for pattern in build_products_whitelist:@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@ path = os.path.join(src, pattern)@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@ for f in glob.glob(path):@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@ dst_path = os.path.join(dst, os.path.relpath(f, src))@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@ if not os.path.isdir(os.path.dirname(dst_path)):@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@ os.makedirs(os.path.dirname(dst_path))@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@ print 'Copying build product %s to %s' % (f, dst_path)@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@ shutil.move(f, dst_path)@@@",
|
|
"@@@STEP_LOG_END@python.inline@@@"
|
|
]
|
|
},
|
|
{
|
|
"name": "$result",
|
|
"recipe_result": null,
|
|
"status_code": 0
|
|
}
|
|
] |