Fix tasks.json and the infra bot
Diffs caused by a collision between two CLs: https://skia-review.googlesource.com/c/13597/ https://skia-review.googlesource.com/c/13770/ Bug: skia: Change-Id: I1173560148e54a273df2ce16bcd8365557938873 Reviewed-on: https://skia-review.googlesource.com/13808 Reviewed-by: Ben Wagner <benjaminwagner@google.com> Reviewed-by: Matt Sarett <msarett@google.com> Commit-Queue: Eric Boren <borenet@google.com>
This commit is contained in:
parent
33ea136cf8
commit
7de9c1a4cb
@ -192,7 +192,6 @@
|
||||
{
|
||||
"cmd": [
|
||||
"make",
|
||||
"-v",
|
||||
"-C",
|
||||
"infra/bots",
|
||||
"test"
|
||||
|
@ -170,7 +170,6 @@
|
||||
{
|
||||
"cmd": [
|
||||
"make",
|
||||
"-v",
|
||||
"-C",
|
||||
"infra/bots",
|
||||
"test"
|
||||
|
@ -24,7 +24,7 @@ def RunSteps(api):
|
||||
|
||||
# Run the infra tests.
|
||||
with api.step.context({'cwd': api.vars.skia_dir, 'env': api.infra.go_env}):
|
||||
api.step('infra_tests', cmd=['make', '-v', '-C', 'infra/bots', 'test'])
|
||||
api.step('infra_tests', cmd=['make', '-C', 'infra/bots', 'test'])
|
||||
|
||||
|
||||
def GenTests(api):
|
||||
|
@ -10022,7 +10022,7 @@
|
||||
{
|
||||
"name": "skia/bots/skimage",
|
||||
"path": "skimage",
|
||||
"version": "version:23"
|
||||
"version": "version:24"
|
||||
},
|
||||
{
|
||||
"name": "skia/bots/skp",
|
||||
@ -10069,7 +10069,7 @@
|
||||
{
|
||||
"name": "skia/bots/skimage",
|
||||
"path": "skimage",
|
||||
"version": "version:23"
|
||||
"version": "version:24"
|
||||
},
|
||||
{
|
||||
"name": "skia/bots/skp",
|
||||
@ -10116,7 +10116,7 @@
|
||||
{
|
||||
"name": "skia/bots/skimage",
|
||||
"path": "skimage",
|
||||
"version": "version:23"
|
||||
"version": "version:24"
|
||||
},
|
||||
{
|
||||
"name": "skia/bots/skp",
|
||||
@ -10163,7 +10163,7 @@
|
||||
{
|
||||
"name": "skia/bots/skimage",
|
||||
"path": "skimage",
|
||||
"version": "version:23"
|
||||
"version": "version:24"
|
||||
},
|
||||
{
|
||||
"name": "skia/bots/skp",
|
||||
@ -10210,7 +10210,7 @@
|
||||
{
|
||||
"name": "skia/bots/skimage",
|
||||
"path": "skimage",
|
||||
"version": "version:23"
|
||||
"version": "version:24"
|
||||
},
|
||||
{
|
||||
"name": "skia/bots/skp",
|
||||
@ -10257,7 +10257,7 @@
|
||||
{
|
||||
"name": "skia/bots/skimage",
|
||||
"path": "skimage",
|
||||
"version": "version:23"
|
||||
"version": "version:24"
|
||||
},
|
||||
{
|
||||
"name": "skia/bots/skp",
|
||||
@ -10304,7 +10304,7 @@
|
||||
{
|
||||
"name": "skia/bots/skimage",
|
||||
"path": "skimage",
|
||||
"version": "version:23"
|
||||
"version": "version:24"
|
||||
},
|
||||
{
|
||||
"name": "skia/bots/skp",
|
||||
@ -10351,7 +10351,7 @@
|
||||
{
|
||||
"name": "skia/bots/skimage",
|
||||
"path": "skimage",
|
||||
"version": "version:23"
|
||||
"version": "version:24"
|
||||
},
|
||||
{
|
||||
"name": "skia/bots/skp",
|
||||
@ -16648,7 +16648,7 @@
|
||||
{
|
||||
"name": "skia/bots/skimage",
|
||||
"path": "skimage",
|
||||
"version": "version:23"
|
||||
"version": "version:24"
|
||||
},
|
||||
{
|
||||
"name": "skia/bots/skp",
|
||||
@ -16695,7 +16695,7 @@
|
||||
{
|
||||
"name": "skia/bots/skimage",
|
||||
"path": "skimage",
|
||||
"version": "version:23"
|
||||
"version": "version:24"
|
||||
},
|
||||
{
|
||||
"name": "skia/bots/skp",
|
||||
@ -16742,7 +16742,7 @@
|
||||
{
|
||||
"name": "skia/bots/skimage",
|
||||
"path": "skimage",
|
||||
"version": "version:23"
|
||||
"version": "version:24"
|
||||
},
|
||||
{
|
||||
"name": "skia/bots/skp",
|
||||
@ -16789,7 +16789,7 @@
|
||||
{
|
||||
"name": "skia/bots/skimage",
|
||||
"path": "skimage",
|
||||
"version": "version:23"
|
||||
"version": "version:24"
|
||||
},
|
||||
{
|
||||
"name": "skia/bots/skp",
|
||||
@ -16836,7 +16836,7 @@
|
||||
{
|
||||
"name": "skia/bots/skimage",
|
||||
"path": "skimage",
|
||||
"version": "version:23"
|
||||
"version": "version:24"
|
||||
},
|
||||
{
|
||||
"name": "skia/bots/skp",
|
||||
@ -16883,7 +16883,7 @@
|
||||
{
|
||||
"name": "skia/bots/skimage",
|
||||
"path": "skimage",
|
||||
"version": "version:23"
|
||||
"version": "version:24"
|
||||
},
|
||||
{
|
||||
"name": "skia/bots/skp",
|
||||
@ -16930,7 +16930,7 @@
|
||||
{
|
||||
"name": "skia/bots/skimage",
|
||||
"path": "skimage",
|
||||
"version": "version:23"
|
||||
"version": "version:24"
|
||||
},
|
||||
{
|
||||
"name": "skia/bots/skp",
|
||||
@ -16977,7 +16977,7 @@
|
||||
{
|
||||
"name": "skia/bots/skimage",
|
||||
"path": "skimage",
|
||||
"version": "version:23"
|
||||
"version": "version:24"
|
||||
},
|
||||
{
|
||||
"name": "skia/bots/skp",
|
||||
@ -17024,7 +17024,7 @@
|
||||
{
|
||||
"name": "skia/bots/skimage",
|
||||
"path": "skimage",
|
||||
"version": "version:23"
|
||||
"version": "version:24"
|
||||
},
|
||||
{
|
||||
"name": "skia/bots/skp",
|
||||
@ -17071,7 +17071,7 @@
|
||||
{
|
||||
"name": "skia/bots/skimage",
|
||||
"path": "skimage",
|
||||
"version": "version:23"
|
||||
"version": "version:24"
|
||||
},
|
||||
{
|
||||
"name": "skia/bots/skp",
|
||||
@ -17118,7 +17118,7 @@
|
||||
{
|
||||
"name": "skia/bots/skimage",
|
||||
"path": "skimage",
|
||||
"version": "version:23"
|
||||
"version": "version:24"
|
||||
},
|
||||
{
|
||||
"name": "skia/bots/skp",
|
||||
@ -17165,7 +17165,7 @@
|
||||
{
|
||||
"name": "skia/bots/skimage",
|
||||
"path": "skimage",
|
||||
"version": "version:23"
|
||||
"version": "version:24"
|
||||
},
|
||||
{
|
||||
"name": "skia/bots/skp",
|
||||
|
Loading…
Reference in New Issue
Block a user