Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(260)

Unified Diff: scripts/slave/recipes/skia/swarm_trigger.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json

Issue 2270963002: Make skia recipes explicitly set GIT_MODE (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Rebase Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: scripts/slave/recipes/skia/swarm_trigger.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json
diff --git a/scripts/slave/recipes/skia/swarm_trigger.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json b/scripts/slave/recipes/skia/swarm_trigger.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json
index 044e51b422abfd30b6ca0450bac611206a0ad493..fa64be3e5e747fc1d0493fe0ab599bb74c7a4922 100644
--- a/scripts/slave/recipes/skia/swarm_trigger.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json
+++ b/scripts/slave/recipes/skia/swarm_trigger.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json
@@ -45,7 +45,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]"
@@ -58,9 +58,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",
@@ -75,18 +80,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::git]/resources/git_setup.py",
"--path",
"[SLAVE_BUILD]/swarming.client",
@@ -576,7 +613,7 @@
"slavename=skiabot-dummy-compile-slave",
"reason=Triggered by Skia swarm_trigger Recipe",
"swarm_out_dir=${ISOLATED_OUTDIR}",
- "revision=164710"
+ "revision=9046e2e693bb92a76e972b694580e5d17ad10748"
],
"name": "[trigger] compile_skia on Windows",
"~followup_annotations": [

Powered by Google App Engine
This is Rietveld 408576698