74be2f2095
This includes: recipes-py:f5e47cfc28..554e8878ac
depot_tools:109907e6a9..1e71b8bdf0
tools/build:f7b41106d6..dcca7cbe7e
The ranges include my generic postprocess/merge change in tools/build that had been failing to roll over in https://skia-review.googlesource.com/c/13920/ along with a few corresponding fixes. Change-Id: I7e328bdb3acfc9b4c219e408c226f181f3b05f3d Reviewed-on: https://skia-review.googlesource.com/14678 Commit-Queue: John Budorick <jbudorick@chromium.org> Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Michael Achenbach <machenbach@chromium.org> Reviewed-by: Eric Boren <borenet@google.com>
286 lines
13 KiB
JSON
286 lines
13 KiB
JSON
[
|
|
{
|
|
"cmd": [
|
|
"python",
|
|
"-u",
|
|
"\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",
|
|
"[CUSTOM_C:\\_B_WORK]",
|
|
"511"
|
|
],
|
|
"infra_step": true,
|
|
"name": "makedirs checkout_path",
|
|
"~followup_annotations": [
|
|
"@@@STEP_LOG_LINE@python.inline@@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",
|
|
"@@@STEP_LOG_END@python.inline@@@"
|
|
]
|
|
},
|
|
{
|
|
"cmd": [
|
|
"git.bat",
|
|
"remote",
|
|
"set-url",
|
|
"origin",
|
|
"https://skia.googlesource.com/other_repo.git"
|
|
],
|
|
"cwd": "[CUSTOM_C:\\_B_WORK]/other_repo",
|
|
"infra_step": true,
|
|
"name": "git remote set-url"
|
|
},
|
|
{
|
|
"cmd": [
|
|
"git.bat",
|
|
"fetch"
|
|
],
|
|
"cwd": "[CUSTOM_C:\\_B_WORK]/other_repo",
|
|
"infra_step": true,
|
|
"name": "git fetch"
|
|
},
|
|
{
|
|
"cmd": [
|
|
"git.bat",
|
|
"reset",
|
|
"--hard",
|
|
"abc123"
|
|
],
|
|
"cwd": "[CUSTOM_C:\\_B_WORK]/other_repo",
|
|
"infra_step": true,
|
|
"name": "git reset"
|
|
},
|
|
{
|
|
"cmd": [
|
|
"git.bat",
|
|
"clean",
|
|
"-d",
|
|
"-f"
|
|
],
|
|
"cwd": "[CUSTOM_C:\\_B_WORK]/other_repo",
|
|
"infra_step": true,
|
|
"name": "git clean"
|
|
},
|
|
{
|
|
"cmd": [
|
|
"python",
|
|
"-u",
|
|
"\nimport os\nimport sys\nos.remove(sys.argv[1])\n",
|
|
"[CUSTOM_C:\\_B_WORK]/.gclient_entries"
|
|
],
|
|
"infra_step": true,
|
|
"name": "remove [CUSTOM_C:\\_B_WORK]/.gclient_entries",
|
|
"~followup_annotations": [
|
|
"@@@STEP_LOG_LINE@python.inline@@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@import os@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@import sys@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@",
|
|
"@@@STEP_LOG_END@python.inline@@@"
|
|
]
|
|
},
|
|
{
|
|
"cmd": [
|
|
"python",
|
|
"-u",
|
|
"RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
|
|
"--spec",
|
|
"cache_dir = '[CUSTOM_C:\\\\_B_CACHE]'\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]",
|
|
"--output_json",
|
|
"/path/to/tmp/json",
|
|
"--revision",
|
|
"other_repo@abc123",
|
|
"--output_manifest"
|
|
],
|
|
"cwd": "[CUSTOM_C:\\_B_WORK]",
|
|
"env": {
|
|
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
|
|
"GIT_HTTP_LOW_SPEED_TIME": "300",
|
|
"PATH": "%(PATH)s: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@ \"other_repo\": \"abc123\"@@@",
|
|
"@@@STEP_LOG_LINE@json.output@ }, @@@",
|
|
"@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
|
|
"@@@STEP_LOG_LINE@json.output@ \"other_repo\": {@@@",
|
|
"@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/other_repo.git\", @@@",
|
|
"@@@STEP_LOG_LINE@json.output@ \"revision\": \"84be67d5f1146c5b7f6d4494c36c52903754abf4\"@@@",
|
|
"@@@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\": \"other_repo\", @@@",
|
|
"@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
|
|
"@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"84be67d5f1146c5b7f6d4494c36c52903754abf4\", @@@",
|
|
"@@@STEP_LOG_LINE@json.output@ \"got_revision_cp\": \"refs/heads/master@{#170933}\"@@@",
|
|
"@@@STEP_LOG_LINE@json.output@ }, @@@",
|
|
"@@@STEP_LOG_LINE@json.output@ \"root\": \"other_repo\", @@@",
|
|
"@@@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@\"84be67d5f1146c5b7f6d4494c36c52903754abf4\"@@@",
|
|
"@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#170933}\"@@@"
|
|
]
|
|
},
|
|
{
|
|
"cmd": [
|
|
"python",
|
|
"-u",
|
|
"[CUSTOM_C:\\_B_WORK]/skia/bin/fetch-gn"
|
|
],
|
|
"cwd": "[CUSTOM_C:\\_B_WORK]/skia",
|
|
"env": {
|
|
"BUILDTYPE": "Release_x64",
|
|
"CHROME_HEADLESS": "1",
|
|
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
|
|
"SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86_64-Release-Vulkan"
|
|
},
|
|
"infra_step": true,
|
|
"name": "fetch-gn"
|
|
},
|
|
{
|
|
"cmd": [
|
|
"[CUSTOM_C:\\_B_WORK]/skia/bin/gn.exe",
|
|
"gen",
|
|
"[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86_64-Release-Vulkan/Release_x64",
|
|
"--args=is_debug=false skia_enable_vulkan_debug_layers=false skia_vulkan_sdk=\"[START_DIR]/win_vulkan_sdk\" target_cpu=\"x86_64\" windk=\"[START_DIR]/t/depot_tools/win_toolchain/vs_files/d3cb0e37bdd120ad0ac4650b674b09e81be45616\""
|
|
],
|
|
"cwd": "[CUSTOM_C:\\_B_WORK]/skia",
|
|
"env": {
|
|
"BUILDTYPE": "Release_x64",
|
|
"CHROME_HEADLESS": "1",
|
|
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
|
|
"SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86_64-Release-Vulkan"
|
|
},
|
|
"name": "gn gen"
|
|
},
|
|
{
|
|
"cmd": [
|
|
"ninja.exe",
|
|
"-C",
|
|
"[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86_64-Release-Vulkan/Release_x64"
|
|
],
|
|
"cwd": "[CUSTOM_C:\\_B_WORK]/skia",
|
|
"env": {
|
|
"BUILDTYPE": "Release_x64",
|
|
"CHROME_HEADLESS": "1",
|
|
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
|
|
"SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86_64-Release-Vulkan"
|
|
},
|
|
"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 = ['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', 'lib/*.so', 'iOSShell.app', 'iOSShell.ipa', 'visualbench', 'visualbench.exe', 'vulkan-1.dll']\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-MSVC-x86_64-Release-Vulkan/Release_x64",
|
|
"[CUSTOM_[SWARM_OUT_DIR]]/out/Release_x64"
|
|
],
|
|
"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 = ['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', 'lib/*.so', 'iOSShell.app', 'iOSShell.ipa', 'visualbench', 'visualbench.exe', 'vulkan-1.dll']@@@",
|
|
"@@@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@@@"
|
|
]
|
|
},
|
|
{
|
|
"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 = ['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', 'lib/*.so', 'iOSShell.app', 'iOSShell.ipa', 'visualbench', 'visualbench.exe', 'vulkan-1.dll']\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]/win_vulkan_sdk",
|
|
"[CUSTOM_[SWARM_OUT_DIR]]/out/Release_x64"
|
|
],
|
|
"infra_step": true,
|
|
"name": "copy build products (2)",
|
|
"~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 = ['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', 'lib/*.so', 'iOSShell.app', 'iOSShell.ipa', 'visualbench', 'visualbench.exe', 'vulkan-1.dll']@@@",
|
|
"@@@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@@@"
|
|
]
|
|
},
|
|
{
|
|
"cmd": [
|
|
"python",
|
|
"-u",
|
|
"import psutil\nfor p in psutil.process_iter():\n try:\n if p.name in ('mspdbsrv.exe', 'vctip.exe', 'cl.exe', 'link.exe'):\n p.kill()\n except psutil._error.AccessDenied:\n pass\n"
|
|
],
|
|
"infra_step": true,
|
|
"name": "cleanup",
|
|
"~followup_annotations": [
|
|
"@@@STEP_LOG_LINE@python.inline@import psutil@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@for p in psutil.process_iter():@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@ try:@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@ if p.name in ('mspdbsrv.exe', 'vctip.exe', 'cl.exe', 'link.exe'):@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@ p.kill()@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@ except psutil._error.AccessDenied:@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@ pass@@@",
|
|
"@@@STEP_LOG_END@python.inline@@@"
|
|
]
|
|
},
|
|
{
|
|
"name": "$result",
|
|
"recipe_result": null,
|
|
"status_code": 0
|
|
}
|
|
] |