| Index: scripts/slave/recipes/skia/swarm_trigger.expected/recipe_with_gerrit_patch.json
|
| diff --git a/scripts/slave/recipes/skia/swarm_trigger.expected/recipe_with_gerrit_patch.json b/scripts/slave/recipes/skia/swarm_trigger.expected/recipe_with_gerrit_patch.json
|
| index d27371e9f16dad56c3a028ab6c63565756c331f9..3057facd2b259f2f62d39686c6e5de1631e346fd 100644
|
| --- a/scripts/slave/recipes/skia/swarm_trigger.expected/recipe_with_gerrit_patch.json
|
| +++ b/scripts/slave/recipes/skia/swarm_trigger.expected/recipe_with_gerrit_patch.json
|
| @@ -6,7 +6,7 @@
|
| "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
|
| "config",
|
| "--spec",
|
| - "cache_dir = None\nsolutions = [{'deps_file': 'DEPS', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]\ntarget_os = ['llvm']"
|
| + "cache_dir = None\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]\ntarget_os = ['llvm']"
|
| ],
|
| "env": {
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| @@ -19,9 +19,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",
|
| @@ -36,18 +41,50 @@
|
| "@@@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"
|
| + ],
|
| + "env": {
|
| + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| + },
|
| + "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"
|
| + ],
|
| + "env": {
|
| + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| + },
|
| + "name": "gclient recurse (git config user.email)"
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| "RECIPE_MODULE[depot_tools::bot_update]/resources/apply_gerrit.py",
|
| "--gerrit_repo",
|
| "skia",
|
| @@ -534,7 +571,7 @@
|
| "reason=Triggered by Skia swarm_trigger Recipe",
|
| "swarm_out_dir=${ISOLATED_OUTDIR}",
|
| "event.patchSet.ref=refs/changes/00/2100/2",
|
| - "revision=164710"
|
| + "revision=9046e2e693bb92a76e972b694580e5d17ad10748"
|
| ],
|
| "name": "[trigger] compile_skia on Ubuntu",
|
| "~followup_annotations": [
|
|
|