Add CanvasKit build
Building CanvasKit uses very similar logic to PathKit, so there
was a fair amount of copy/paste/customize.
Fixes the name of skia.js/wasm -> canvaskit.js/wasm and
adds a package.json to formally track versions.
Also move PathKit helper scripts to align better.
Docs-Preview: https://skia.org/?cl=160463
Bug: skia:
Change-Id: Ie75b30592dcc4d520dca41f6f5579006aaa8849b
Reviewed-on: https://skia-review.googlesource.com/c/160463
Reviewed-by: Eric Boren <borenet@google.com>
diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go
index e2705f6..a9c3452 100644
--- a/infra/bots/gen_tasks.go
+++ b/infra/bots/gen_tasks.go
@@ -312,7 +312,7 @@
Dependencies: []string{BUNDLE_RECIPES_NAME},
Dimensions: dimensions,
EnvPrefixes: map[string][]string{
- "PATH": []string{"cipd_bin_packages", "cipd_bin_packages/bin"},
+ "PATH": []string{"cipd_bin_packages", "cipd_bin_packages/bin"},
"VPYTHON_VIRTUALENV_ROOT": []string{"cache/vpython"},
},
ExtraTags: map[string]string{
@@ -401,6 +401,9 @@
if strings.Contains(jobName, "PathKit") {
ec = []string{"PathKit"}
}
+ if strings.Contains(jobName, "CanvasKit") {
+ ec = []string{"CanvasKit"}
+ }
if len(ec) > 0 {
jobNameMap["extra_config"] = strings.Join(ec, "_")
}
@@ -608,7 +611,7 @@
} else {
d["gpu"] = "none"
if d["os"] == DEFAULT_OS_DEBIAN {
- if strings.Contains(parts["extra_config"], "PathKit") {
+ if strings.Contains(parts["extra_config"], "PathKit") || strings.Contains(parts["extra_config"], "CanvasKit") {
// The build isn't really parallelized for pathkit, so
// the bulky machines don't buy us much. All we really need is
// docker, which was manually installed on the MEDIUM and LARGE
@@ -1077,6 +1080,8 @@
recipe = "compute_test"
} else if strings.Contains(name, "PathKit") {
recipe = "test_pathkit"
+ } else if strings.Contains(name, "CanvasKit") {
+ recipe = "test_canvaskit"
} else if strings.Contains(name, "LottieWeb") {
recipe = "test_lottie_web"
}
@@ -1088,7 +1093,7 @@
extraProps["internal_hardware_label"] = strconv.Itoa(*iid)
}
isolate := "test_skia_bundled.isolate"
- if strings.Contains(name, "PathKit") || strings.Contains(name, "LottieWeb") || strings.Contains(name, "Emulator") {
+ if strings.Contains(name, "CanvasKit") || strings.Contains(name, "Emulator") || strings.Contains(name, "LottieWeb") || strings.Contains(name, "PathKit") {
isolate = "swarm_recipe.isolate"
}
task := kitchenTask(name, recipe, isolate, "", swarmDimensions(parts), extraProps, OUTPUT_TEST)
@@ -1363,7 +1368,7 @@
if strings.Contains(name, "ProcDump") {
pkgs = append(pkgs, b.MustGetCipdPackageFromAsset("procdump_win"))
}
- if strings.Contains(name, "PathKit") || strings.Contains(name, "LottieWeb") {
+ if strings.Contains(name, "CanvasKit") || strings.Contains(name, "LottieWeb") || strings.Contains(name, "PathKit") {
// Docker-based tests that don't need the standard CIPD assets
pkgs = []*specs.CipdPackage{}
}