AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[infra] Flutter bot should sync to origin/skia-master

Browse Source 
Bug: skia:
Change-Id: I223bef522ff8605674f4ecabcbd0624cfc92cb06
Reviewed-on: https://skia-review.googlesource.com/c/173224
Reviewed-by: Ravi Mistry <rmistry@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
This commit is contained in:
Eric Boren 2018-11-28 11:31:28 -05:00 committed by Skia Commit-Bot
parent ef4047db96
commit 8061053b73
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
infra/bots/recipe_modules/checkout/api.py
View File

@ -94,7 +94,7 @@ class CheckoutApi(recipe_api.RecipeApi):
if checkout_flutter:
# Skia is a DEP of Flutter; the 'revision' property is a Skia revision,
# and any patch should be applied to Skia, not Flutter.
main.revision = 'origin/master'
main.revision = 'origin/skia-master'
main.managed = True
m[main_name] = 'got_flutter_revision'
if flutter_android:

4
infra/bots/recipe_modules/checkout/examples/full.expected/flutter_trybot.json
View File

@ -47,7 +47,7 @@
"--patch_ref",
"https://skia.googlesource.com/skia.git@refs/changes/89/456789/12",
"--revision",
"src/flutter@origin/master",
"src/flutter@origin/skia-master",
"--revision",
"src/third_party/skia@abc123"
],
@ -64,7 +64,7 @@
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@",
"@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"src/flutter\": \"origin/master\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"src/flutter\": \"origin/skia-master\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"src/third_party/skia\": \"abc123\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",

4
infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-Flutter_Android.json
View File

@ -45,7 +45,7 @@
"--output_json",
"/path/to/tmp/json",
"--revision",
"src/flutter@origin/master",
"src/flutter@origin/skia-master",
"--revision",
"src/third_party/skia@abc123"
],
@ -62,7 +62,7 @@
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@",
"@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"src/flutter\": \"origin/master\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"src/flutter\": \"origin/skia-master\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"src/third_party/skia\": \"abc123\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",