Index: infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-Arm7-Release-iOS.json |
diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-Arm7-Release-iOS.json b/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-Arm7-Release-iOS.json |
index 0efa47d320103bc07fa726f5eb0b2d958aaf47f7..2bab39923587d15418054c0e9380698b809d29ab 100644 |
--- a/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-Arm7-Release-iOS.json |
+++ b/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-Arm7-Release-iOS.json |
@@ -25,102 +25,58 @@ |
"cmd": [ |
"python", |
"-u", |
- "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", |
- "config", |
+ "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", |
"--spec", |
- "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]" |
- ], |
- "cwd": "[CUSTOM_/_B_WORK]", |
- "env": { |
- "BUILDTYPE": "Release", |
- "CHROME_HEADLESS": "1", |
- "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", |
- "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-Arm7-Release-iOS" |
- }, |
- "name": "gclient setup" |
- }, |
- { |
- "cmd": [ |
- "python", |
- "-u", |
- "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", |
- "sync", |
- "--verbose", |
- "--with_branch_heads", |
- "--nohooks", |
- "-j8", |
- "--reset", |
- "--force", |
- "--upstream", |
- "--no-nag-max", |
- "--delete_unversioned_trees", |
+ "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", |
+ "{\"skia\": \"got_revision\"}", |
+ "--git-cache-dir", |
+ "[CUSTOM_/_B_CACHE]", |
+ "--output_json", |
+ "/path/to/tmp/json", |
"--revision", |
"skia@abc123", |
- "--output-json", |
- "/path/to/tmp/json" |
+ "--output_manifest" |
], |
"cwd": "[CUSTOM_/_B_WORK]", |
"env": { |
"BUILDTYPE": "Release", |
"CHROME_HEADLESS": "1", |
- "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", |
+ "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", |
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-Arm7-Release-iOS" |
}, |
- "name": "gclient sync", |
+ "name": "bot_update", |
"~followup_annotations": [ |
+ "@@@STEP_TEXT@Some step text@@@", |
"@@@STEP_LOG_LINE@json.output@{@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"skia/\": {@@@", |
+ "@@@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@ }, @@@", |
+ "@@@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@ }, @@@", |
+ "@@@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@ \"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@\"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@", |
+ "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#164710}\"@@@" |
] |
}, |
{ |
"cmd": [ |
- "python", |
- "-u", |
- "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", |
- "recurse", |
- "git", |
- "config", |
- "user.name", |
- "local_bot" |
- ], |
- "cwd": "[CUSTOM_/_B_WORK]", |
- "env": { |
- "BUILDTYPE": "Release", |
- "CHROME_HEADLESS": "1", |
- "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", |
- "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-Arm7-Release-iOS" |
- }, |
- "name": "gclient recurse (git config user.name)" |
- }, |
- { |
- "cmd": [ |
- "python", |
- "-u", |
- "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", |
- "recurse", |
- "git", |
- "config", |
- "user.email", |
- "local_bot@example.com" |
- ], |
- "cwd": "[CUSTOM_/_B_WORK]", |
- "env": { |
- "BUILDTYPE": "Release", |
- "CHROME_HEADLESS": "1", |
- "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", |
- "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-Arm7-Release-iOS" |
- }, |
- "name": "gclient recurse (git config user.email)" |
- }, |
- { |
- "cmd": [ |
"[CUSTOM_/_B_WORK]/skia/platform_tools/ios/bin/ios_ninja" |
], |
"cwd": "[CUSTOM_/_B_WORK]/skia", |
@@ -130,7 +86,7 @@ |
"CHROME_HEADLESS": "1", |
"CXX": "/usr/bin/clang++", |
"GYP_DEFINES": "skia_arch_type=arm skia_clang_build=1 skia_os=ios skia_warnings_as_errors=1", |
- "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", |
+ "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", |
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-Arm7-Release-iOS" |
}, |
"name": "build iOSShell" |