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 df20849b68d0df4a234b320febb4eaef63924a91..0efa47d320103bc07fa726f5eb0b2d958aaf47f7 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 |
@@ -28,7 +28,7 @@ |
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", |
"config", |
"--spec", |
- "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': 'DEPS', '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'}]" |
], |
"cwd": "[CUSTOM_/_B_WORK]", |
"env": { |
@@ -45,9 +45,14 @@ |
"-u", |
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", |
"sync", |
+ "--verbose", |
+ "--with_branch_heads", |
"--nohooks", |
+ "-j8", |
+ "--reset", |
"--force", |
- "--verbose", |
+ "--upstream", |
+ "--no-nag-max", |
"--delete_unversioned_trees", |
"--revision", |
"skia@abc123", |
@@ -66,16 +71,56 @@ |
"@@@STEP_LOG_LINE@json.output@{@@@", |
"@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@", |
"@@@STEP_LOG_LINE@json.output@ \"skia/\": {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"revision\": 164710@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"revision\": \"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@", |
"@@@STEP_LOG_LINE@json.output@ }@@@", |
"@@@STEP_LOG_LINE@json.output@ }@@@", |
"@@@STEP_LOG_LINE@json.output@}@@@", |
"@@@STEP_LOG_END@json.output@@@", |
- "@@@SET_BUILD_PROPERTY@got_revision@164710@@@" |
+ "@@@SET_BUILD_PROPERTY@got_revision@\"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@" |
] |
}, |
{ |
"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", |
@@ -85,7 +130,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]", |
+ "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": "build iOSShell" |