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

[commandbuffer] Update infra dep to fix CommandBuffer

Browse Source 
Removes --alsologtostderr flag, which was removed along with glog.

Change-Id: I8d2b5ac267feb0f8f88e19d346c7292fc825b1fb
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/442316
Reviewed-by: Erik Rose <erikrose@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
This commit is contained in:
Eric Boren 2021-08-27 09:41:34 -04:00 committed by SkCQ
parent 0454fcb8c8
commit c82eab82f1
4 changed files with 3317 additions and 3344 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
go.mod
View File

@ -18,6 +18,8 @@ require (
github.com/boltdb/bolt v1.3.1 // indirect
github.com/codegangsta/negroni v1.0.0 // indirect
github.com/daaku/go.zipexe v1.0.1 // indirect
github.com/dgraph-io/ristretto v0.0.3 // indirect
github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96 // indirect
github.com/dustin/go-humanize v1.0.0 // indirect
github.com/flynn/json5 v0.0.0-20160717195620-7620272ed633
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
@ -47,7 +49,7 @@ require (
github.com/yosuke-furukawa/json5 v0.1.1 // indirect
go.chromium.org/gae v0.0.0-20190826183307-50a499513efa // indirect
go.chromium.org/luci v0.0.0-20201121231857-b9ab316d7198 // indirect
go.skia.org/infra v0.0.0-20210805161050-852830eb10cf
go.skia.org/infra v0.0.0-20210826161750-abfa88005ea2
go.starlark.net v0.0.0-20201118183435-e55f603d8c79 // indirect
golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83
golang.org/x/exp v0.0.0-20200228211341-fcea875c7e85 // indirect

4
go.sum
View File

@ -839,6 +839,8 @@ github.com/google/go-licenses v0.0.0-20210715153004-8751804a5b80 h1:LFxfYF9RntrK
github.com/google/go-licenses v0.0.0-20210715153004-8751804a5b80/go.mod h1:yrUa7XR4KpFKeb+/N8/NokREkP3p25uqXDSfIFMO4fA=
github.com/google/go-licenses v0.0.0-20210727195037-24e2421190d8 h1:witO2HVN17VLN3zqEkHqvgzUyz/G9nGDMGJccZBXPhA=
github.com/google/go-licenses v0.0.0-20210727195037-24e2421190d8/go.mod h1:WkPB6PtjnM1pF4qeK8RcFmk7z+TIsrPYOng7OPlFDiw=
github.com/google/go-licenses v0.0.0-20210816172045-3099c18c36e1 h1:ZK63Yns/0Y8hE5y50WuSsfFWNPmpYDQ9tzh/J2vWV8c=
github.com/google/go-licenses v0.0.0-20210816172045-3099c18c36e1/go.mod h1:WkPB6PtjnM1pF4qeK8RcFmk7z+TIsrPYOng7OPlFDiw=
github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk=
github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
@ -2077,6 +2079,8 @@ go.skia.org/infra v0.0.0-20210805134743-b82de02ca21f h1:HFpFtcGMI3zt3r/FUTGtNngU
go.skia.org/infra v0.0.0-20210805134743-b82de02ca21f/go.mod h1:GyZrul70Cfa4weHZsZewKFguAq/o2UzvrVxnU35Z+Yo=
go.skia.org/infra v0.0.0-20210805161050-852830eb10cf h1:6Wl/2EAmBMbFCx5iVi1OejEXgd1gX6C/hVJUKGYaYjI=
go.skia.org/infra v0.0.0-20210805161050-852830eb10cf/go.mod h1:GyZrul70Cfa4weHZsZewKFguAq/o2UzvrVxnU35Z+Yo=
go.skia.org/infra v0.0.0-20210826161750-abfa88005ea2 h1:rtUkzTl262cTcNNXzb+2dtLo5kkKFmzAt8V6fCt5cas=
go.skia.org/infra v0.0.0-20210826161750-abfa88005ea2/go.mod h1:BX7j5CR8GabRog5/v70hZ7QERcahOEUvzkDN/oBJSEM=
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5/go.mod h1:nmDLcffg48OtT/PSW0Hg7FvpRQsQh5OSqIylirxKC7o=
go.starlark.net v0.0.0-20201118183435-e55f603d8c79 h1:JPjLPz44y2N9mkzh2N344kTk1Y4/V4yJAjTrXGmzv8I=
go.starlark.net v0.0.0-20201118183435-e55f603d8c79/go.mod h1:5YFcFnRptTN+41758c2bMPiqpGg4zBfYji1IQz8wNFk=

16
infra/bots/gen_tasks_logic/gen_tasks_logic.go
View File

@ -1023,7 +1023,6 @@ func (b *jobBuilder) updateGoDeps() {
"--patch_issue", specs.PLACEHOLDER_ISSUE,
"--patch_set", specs.PLACEHOLDER_PATCHSET,
"--patch_server", specs.PLACEHOLDER_CODEREVIEW_SERVER,
"--alsologtostderr",
)
b.dep(b.buildTaskDrivers("linux", "amd64"))
b.linuxGceDimensions(MACHINE_TYPE_MEDIUM)
@ -1065,7 +1064,6 @@ func (b *jobBuilder) createDockerImage(wasm bool) string {
"--patch_set", specs.PLACEHOLDER_PATCHSET,
"--patch_server", specs.PLACEHOLDER_CODEREVIEW_SERVER,
"--swarm_out_dir", specs.PLACEHOLDER_ISOLATED_OUTDIR,
"--alsologtostderr",
)
b.dep(b.buildTaskDrivers("linux", "amd64"))
// TODO(borenet): Does this task need go/go/bin in PATH?
@ -1098,7 +1096,6 @@ func (b *jobBuilder) createPushAppsFromSkiaDockerImage() {
"--patch_issue", specs.PLACEHOLDER_ISSUE,
"--patch_set", specs.PLACEHOLDER_PATCHSET,
"--patch_server", specs.PLACEHOLDER_CODEREVIEW_SERVER,
"--alsologtostderr",
)
b.dep(b.buildTaskDrivers("linux", "amd64"))
b.dep(b.createDockerImage(false))
@ -1131,7 +1128,6 @@ func (b *jobBuilder) createPushAppsFromWASMDockerImage() {
"--patch_issue", specs.PLACEHOLDER_ISSUE,
"--patch_set", specs.PLACEHOLDER_PATCHSET,
"--patch_server", specs.PLACEHOLDER_CODEREVIEW_SERVER,
"--alsologtostderr",
)
b.dep(b.buildTaskDrivers("linux", "amd64"))
b.dep(b.createDockerImage(true))
@ -1283,7 +1279,6 @@ func (b *jobBuilder) recreateSKPs() {
"--patch_ref", specs.PLACEHOLDER_PATCH_REF,
"--git_cache", "cache/git",
"--checkout_root", "cache/work",
"--alsologtostderr",
}
if b.matchExtraConfig("DryRun") {
cmd = append(cmd, "--dry_run")
@ -1333,7 +1328,7 @@ func (b *jobBuilder) checkGnToBp() {
"--project_id", "skia-swarming-bots",
"--task_id", specs.PLACEHOLDER_TASK_ID,
"--task_name", b.Name,
"--alsologtostderr")
)
b.linuxGceDimensions(MACHINE_TYPE_SMALL)
b.usesPython()
b.serviceAccount(b.cfg.ServiceAccountHousekeeper)
@ -1369,7 +1364,7 @@ func (b *jobBuilder) g3FrameworkCanary() {
"--patch_issue", specs.PLACEHOLDER_ISSUE,
"--patch_set", specs.PLACEHOLDER_PATCHSET,
"--patch_server", specs.PLACEHOLDER_CODEREVIEW_SERVER,
"--alsologtostderr")
)
b.linuxGceDimensions(MACHINE_TYPE_SMALL)
b.cipd(CIPD_PKG_LUCI_AUTH)
b.serviceAccount("skia-g3-framework-compile@skia-swarming-bots.iam.gserviceaccount.com")
@ -1668,7 +1663,7 @@ func (b *jobBuilder) canary(rollerName string) {
"--patch_issue", specs.PLACEHOLDER_ISSUE,
"--patch_set", specs.PLACEHOLDER_PATCHSET,
"--patch_server", specs.PLACEHOLDER_CODEREVIEW_SERVER,
"--alsologtostderr")
)
b.linuxGceDimensions(MACHINE_TYPE_SMALL)
b.cipd(CIPD_PKG_LUCI_AUTH)
b.serviceAccount(b.cfg.ServiceAccountCanary)
@ -1713,7 +1708,6 @@ func (b *jobBuilder) puppeteer() {
"--cpu_or_gpu_trace", b.parts["cpu_or_gpu"],
"--cpu_or_gpu_value_trace", b.parts["cpu_or_gpu_value"],
"--webgl_version", webglversion, // ignore when running with cpu backend
"--alsologtostderr",
)
// This CIPD package was made by hand with the following invocation:
// cipd create -name skia/internal/lotties_with_assets -in ./lotties/ -tag version:0
@ -1743,7 +1737,6 @@ func (b *jobBuilder) puppeteer() {
"--cpu_or_gpu_trace", b.parts["cpu_or_gpu"],
"--cpu_or_gpu_value_trace", b.parts["cpu_or_gpu_value"],
"--webgl_version", webglversion,
"--alsologtostderr",
)
b.asset("skp")
} else if b.extraConfig("CanvasPerf") { // refers to the canvas_perf.js test suite
@ -1762,7 +1755,6 @@ func (b *jobBuilder) puppeteer() {
"--cpu_or_gpu_trace", b.parts["cpu_or_gpu"],
"--cpu_or_gpu_value_trace", b.parts["cpu_or_gpu_value"],
"--webgl_version", webglversion,
"--alsologtostderr",
)
b.asset("skp")
}
@ -1941,7 +1933,6 @@ func (b *jobBuilder) compileWasmGMTests(compileName string) {
"--out_path", "./wasm_out",
"--skia_path", "./skia",
"--work_path", "./cache/docker/wasm_gm",
"--alsologtostderr",
)
})
}
@ -1989,7 +1980,6 @@ func (b *jobBuilder) runWasmGMTests() {
"--gold_key", "cpu_or_gpu_value:QuadroP400",
"--gold_key", "model:Golo",
"--gold_key", "os:Ubuntu18",
"--alsologtostderr",
)
})
}

6637
infra/bots/tasks.json
View File

File diff suppressed because it is too large Load Diff