diff options
| author |  Ravi Mistry <rmistry@google.com> | 2018-05-15 15:46:47 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-05-16 14:36:54 +0000 |
| commit | fedc8476cf8e26f7bfb862c93b268431000ee371 (patch) | |
| tree | c66b8ce2fbf74eeb762acc44193313b516cbf3a9 /infra | |
| parent | 510e9e399b3de12e61c98577c32387b61f71accd (diff) | |
Use Chromium ToT instead of lkcr
https://chromium.googlesource.com/chromium/src/+/lkcr has not been
updated in months now.
CT uses Chromium ToT and has rarely run into problems because of that.
Bug: skia:7917
Change-Id: I007b8f29b2320ffbc45ab5c5a75b081fbb8d7afa
Reviewed-on: https://skia-review.googlesource.com/128319
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Ravi Mistry <rmistry@google.com>
Diffstat (limited to 'infra')
6 files changed, 11 insertions, 11 deletions
diff --git a/infra/bots/recipe_modules/core/api.py b/infra/bots/recipe_modules/core/api.py index bb1202814c..f7b5113255 100644 --- a/infra/bots/recipe_modules/core/api.py +++ b/infra/bots/recipe_modules/core/api.py @@ -54,7 +54,7 @@ class SkiaApi(recipe_api.RecipeApi): chromium.name = 'src' chromium.managed = False chromium.url = 'https://chromium.googlesource.com/chromium/src.git' - chromium.revision = 'origin/lkcr' + chromium.revision = 'origin/master' main_repo = self.m.properties['repository'] if self.m.vars.need_flutter_checkout: diff --git a/infra/bots/recipe_modules/core/examples/full.expected/Housekeeper-Weekly-RecreateSKPs.json b/infra/bots/recipe_modules/core/examples/full.expected/Housekeeper-Weekly-RecreateSKPs.json index f77b023f39..f3980c9d00 100644 --- a/infra/bots/recipe_modules/core/examples/full.expected/Housekeeper-Weekly-RecreateSKPs.json +++ b/infra/bots/recipe_modules/core/examples/full.expected/Housekeeper-Weekly-RecreateSKPs.json @@ -47,7 +47,7 @@ "--revision", "skia@abc123", "--revision", - "src@origin/lkcr" + "src@origin/master" ], "cwd": "[START_DIR]/cache/work", "env_prefixes": { @@ -63,7 +63,7 @@ "@@@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@ \"src\": \"origin/lkcr\"@@@", + "@@@STEP_LOG_LINE@json.output@ \"src\": \"origin/master\"@@@", "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"skia\": {@@@", diff --git a/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json b/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json index 4a7de747cd..fd36d2a98d 100644 --- a/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json +++ b/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json @@ -47,7 +47,7 @@ "--revision", "skia@abc123", "--revision", - "src@origin/lkcr" + "src@origin/master" ], "cwd": "[START_DIR]/cache/work", "env_prefixes": { @@ -63,7 +63,7 @@ "@@@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@ \"src\": \"origin/lkcr\"@@@", + "@@@STEP_LOG_LINE@json.output@ \"src\": \"origin/master\"@@@", "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"skia\": {@@@", diff --git a/infra/bots/recipes/recreate_skps.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json b/infra/bots/recipes/recreate_skps.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json index aacd040b0f..949cd9386c 100644 --- a/infra/bots/recipes/recreate_skps.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json +++ b/infra/bots/recipes/recreate_skps.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json @@ -47,7 +47,7 @@ "--revision", "skia@abc123", "--revision", - "src@origin/lkcr" + "src@origin/master" ], "cwd": "[START_DIR]/cache/work", "env_prefixes": { @@ -63,7 +63,7 @@ "@@@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@ \"src\": \"origin/lkcr\"@@@", + "@@@STEP_LOG_LINE@json.output@ \"src\": \"origin/master\"@@@", "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"skia\": {@@@", diff --git a/infra/bots/recipes/recreate_skps.expected/Housekeeper-Weekly-RecreateSKPs.json b/infra/bots/recipes/recreate_skps.expected/Housekeeper-Weekly-RecreateSKPs.json index 71ccfc6d17..35bd377ce6 100644 --- a/infra/bots/recipes/recreate_skps.expected/Housekeeper-Weekly-RecreateSKPs.json +++ b/infra/bots/recipes/recreate_skps.expected/Housekeeper-Weekly-RecreateSKPs.json @@ -47,7 +47,7 @@ "--revision", "skia@abc123", "--revision", - "src@origin/lkcr" + "src@origin/master" ], "cwd": "[START_DIR]/cache/work", "env_prefixes": { @@ -63,7 +63,7 @@ "@@@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@ \"src\": \"origin/lkcr\"@@@", + "@@@STEP_LOG_LINE@json.output@ \"src\": \"origin/master\"@@@", "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"skia\": {@@@", diff --git a/infra/bots/recipes/recreate_skps.expected/failed_upload.json b/infra/bots/recipes/recreate_skps.expected/failed_upload.json index 9cb8de52d9..2078155fa6 100644 --- a/infra/bots/recipes/recreate_skps.expected/failed_upload.json +++ b/infra/bots/recipes/recreate_skps.expected/failed_upload.json @@ -47,7 +47,7 @@ "--revision", "skia@abc123", "--revision", - "src@origin/lkcr" + "src@origin/master" ], "cwd": "[START_DIR]/cache/work", "env_prefixes": { @@ -63,7 +63,7 @@ "@@@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@ \"src\": \"origin/lkcr\"@@@", + "@@@STEP_LOG_LINE@json.output@ \"src\": \"origin/master\"@@@", "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"skia\": {@@@", |