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

[bazel] Add 4 CI jobs, 1 CQ job to test Bazel builds

Browse Source 
Needed to fix the Dawn and Harfbuzz Bazel rules.

Change-Id: I21f63c970bdc972b97e42ef85d82d7f478bd45e2
Bug: skia:12541
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/545721
Reviewed-by: Eric Boren <borenet@google.com>
This commit is contained in:
Kevin Lubick 2022-06-02 08:34:35 -04:00
parent ee62fad9a4
commit 455addeff6
5 changed files with 210 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bazel/external/dawn/BUILD.bazel vendored
View File

@ -808,6 +808,8 @@ TINT_SRCS = [
"src/tint/program_id.h",
"src/tint/reader/reader.cc",
"src/tint/reader/reader.h",
"src/tint/resolver/const_eval.h",
"src/tint/resolver/const_eval.cc",
"src/tint/resolver/ctor_conv_intrinsic.cc",
"src/tint/resolver/ctor_conv_intrinsic.h",
"src/tint/resolver/dependency_graph.cc",
@ -862,8 +864,6 @@ TINT_SRCS = [
"src/tint/transform/expand_compound_assignment.h",
"src/tint/transform/first_index_offset.cc",
"src/tint/transform/first_index_offset.h",
"src/tint/transform/fold_constants.cc",
"src/tint/transform/fold_constants.h",
"src/tint/transform/fold_trivial_single_use_lets.cc",
"src/tint/transform/fold_trivial_single_use_lets.h",
"src/tint/transform/for_loop_to_loop.cc",

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

@ -2099,6 +2099,9 @@ func (b *jobBuilder) runWasmGMTests() {
// The reason we need this mapping is because Buildbucket build names cannot have / or : in them.
var shorthandToLabel = map[string]string{
"modules_canvaskit_canvaskit_wasm": "//modules/canvaskit:canvaskit_wasm",
"example_hello_world_dawn": "//example:hello_world_dawn",
"example_hello_world_gl": "//example:hello_world_gl",
"example_hello_world_vulkan": "//example:hello_world_vulkan",
}
// bazelBuild adds a task which builds the specified single-target label (//foo:bar) or

6
infra/bots/jobs.json
View File

@ -1,4 +1,10 @@
[
{"name": "BazelBuild-modules_canvaskit_canvaskit_wasm-debug-linux_x64"},
{"name": "BazelBuild-example_hello_world_dawn-release-linux_x64",
"cq_config": {}
},
{"name": "BazelBuild-example_hello_world_gl-release-linux_x64"},
{"name": "BazelBuild-example_hello_world_vulkan-release-linux_x64"},
{"name": "Build-Debian9-Clang-arm-Release-Flutter_Android_Docker"},
{"name": "Build-Debian10-GCC-x86-Debug-Docker"},
{"name": "Build-Debian10-GCC-x86-Release-Docker"},

177
infra/bots/tasks.json
View File

@ -1,5 +1,25 @@
{
"jobs": {
"BazelBuild-example_hello_world_dawn-release-linux_x64": {
"tasks": [
"BazelBuild-example_hello_world_dawn-release-linux_x64"
]
},
"BazelBuild-example_hello_world_gl-release-linux_x64": {
"tasks": [
"BazelBuild-example_hello_world_gl-release-linux_x64"
]
},
"BazelBuild-example_hello_world_vulkan-release-linux_x64": {
"tasks": [
"BazelBuild-example_hello_world_vulkan-release-linux_x64"
]
},
"BazelBuild-modules_canvaskit_canvaskit_wasm-debug-linux_x64": {
"tasks": [
"BazelBuild-modules_canvaskit_canvaskit_wasm-debug-linux_x64"
]
},
"Build-Debian10-Clang-arm-Debug-Android": {
"tasks": [
"Build-Debian10-Clang-arm-Debug-Android"
@ -3195,6 +3215,162 @@
}
},
"tasks": {
"BazelBuild-example_hello_world_dawn-release-linux_x64": {
"casSpec": "compile",
"cipd_packages": [
{
"name": "skia/bots/bazelisk",
"path": "bazelisk",
"version": "version:0"
}
],
"command": [
"./bazel_build",
"--project_id=skia-swarming-bots",
"--task_id=<(TASK_ID)",
"--task_name=BazelBuild-example_hello_world_dawn-release-linux_x64",
"--label=//example:hello_world_dawn",
"--config=release",
"--bazel_arg=--config=linux_rbe",
"--bazel_arg=--jobs=100",
"--bazel_arg=--remote_download_minimal"
],
"dependencies": [
"Housekeeper-PerCommit-BuildTaskDrivers_linux_amd64"
],
"dimensions": [
"cpu:x86-64-Haswell_GCE",
"gpu:none",
"machine_type:n1-standard-16",
"os:Debian-10.3",
"pool:Skia"
],
"env_prefixes": {
"PATH": [
"bazelisk"
]
},
"idempotent": true,
"max_attempts": 1,
"service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
},
"BazelBuild-example_hello_world_gl-release-linux_x64": {
"casSpec": "compile",
"cipd_packages": [
{
"name": "skia/bots/bazelisk",
"path": "bazelisk",
"version": "version:0"
}
],
"command": [
"./bazel_build",
"--project_id=skia-swarming-bots",
"--task_id=<(TASK_ID)",
"--task_name=BazelBuild-example_hello_world_gl-release-linux_x64",
"--label=//example:hello_world_gl",
"--config=release",
"--bazel_arg=--config=linux_rbe",
"--bazel_arg=--jobs=100",
"--bazel_arg=--remote_download_minimal"
],
"dependencies": [
"Housekeeper-PerCommit-BuildTaskDrivers_linux_amd64"
],
"dimensions": [
"cpu:x86-64-Haswell_GCE",
"gpu:none",
"machine_type:n1-standard-16",
"os:Debian-10.3",
"pool:Skia"
],
"env_prefixes": {
"PATH": [
"bazelisk"
]
},
"idempotent": true,
"max_attempts": 1,
"service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
},
"BazelBuild-example_hello_world_vulkan-release-linux_x64": {
"casSpec": "compile",
"cipd_packages": [
{
"name": "skia/bots/bazelisk",
"path": "bazelisk",
"version": "version:0"
}
],
"command": [
"./bazel_build",
"--project_id=skia-swarming-bots",
"--task_id=<(TASK_ID)",
"--task_name=BazelBuild-example_hello_world_vulkan-release-linux_x64",
"--label=//example:hello_world_vulkan",
"--config=release",
"--bazel_arg=--config=linux_rbe",
"--bazel_arg=--jobs=100",
"--bazel_arg=--remote_download_minimal"
],
"dependencies": [
"Housekeeper-PerCommit-BuildTaskDrivers_linux_amd64"
],
"dimensions": [
"cpu:x86-64-Haswell_GCE",
"gpu:none",
"machine_type:n1-standard-16",
"os:Debian-10.3",
"pool:Skia"
],
"env_prefixes": {
"PATH": [
"bazelisk"
]
},
"idempotent": true,
"max_attempts": 1,
"service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
},
"BazelBuild-modules_canvaskit_canvaskit_wasm-debug-linux_x64": {
"casSpec": "compile",
"cipd_packages": [
{
"name": "skia/bots/bazelisk",
"path": "bazelisk",
"version": "version:0"
}
],
"command": [
"./bazel_build",
"--project_id=skia-swarming-bots",
"--task_id=<(TASK_ID)",
"--task_name=BazelBuild-modules_canvaskit_canvaskit_wasm-debug-linux_x64",
"--label=//modules/canvaskit:canvaskit_wasm",
"--config=debug",
"--bazel_arg=--config=linux_rbe",
"--bazel_arg=--jobs=100",
"--bazel_arg=--remote_download_minimal"
],
"dependencies": [
"Housekeeper-PerCommit-BuildTaskDrivers_linux_amd64"
],
"dimensions": [
"cpu:x86-64-Haswell_GCE",
"gpu:none",
"machine_type:n1-standard-16",
"os:Debian-10.3",
"pool:Skia"
],
"env_prefixes": {
"PATH": [
"bazelisk"
]
},
"idempotent": true,
"max_attempts": 1,
"service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
},
"Build-Debian10-Clang-arm-Debug-Android": {
"caches": [
{
@ -83356,6 +83532,7 @@
}
},
"commit_queue": {
"BazelBuild-example_hello_world_dawn-release-linux_x64": {},
"Build-Debian10-Clang-arm-Debug-Android": {},
"Build-Debian10-Clang-arm-Release-Android_API26": {},
"Build-Debian10-Clang-arm64-Debug-Android": {},

22
third_party/BUILD.bazel vendored
View File

@ -1435,6 +1435,28 @@ HARFBUZZ_HDRS = [
]
HARFBUZZ_SRCS = [
"externals/harfbuzz/src/OT/Layout/GSUB/AlternateSet.hh",
"externals/harfbuzz/src/OT/Layout/GSUB/AlternateSubst.hh",
"externals/harfbuzz/src/OT/Layout/GSUB/AlternateSubstFormat1.hh",
"externals/harfbuzz/src/OT/Layout/GSUB/ChainContextSubst.hh",
"externals/harfbuzz/src/OT/Layout/GSUB/Common.hh",
"externals/harfbuzz/src/OT/Layout/GSUB/ContextSubst.hh",
"externals/harfbuzz/src/OT/Layout/GSUB/ExtensionSubst.hh",
"externals/harfbuzz/src/OT/Layout/GSUB/GSUB.hh",
"externals/harfbuzz/src/OT/Layout/GSUB/Ligature.hh",
"externals/harfbuzz/src/OT/Layout/GSUB/LigatureSet.hh",
"externals/harfbuzz/src/OT/Layout/GSUB/LigatureSubst.hh",
"externals/harfbuzz/src/OT/Layout/GSUB/LigatureSubstFormat1.hh",
"externals/harfbuzz/src/OT/Layout/GSUB/MultipleSubst.hh",
"externals/harfbuzz/src/OT/Layout/GSUB/MultipleSubstFormat1.hh",
"externals/harfbuzz/src/OT/Layout/GSUB/ReverseChainSingleSubst.hh",
"externals/harfbuzz/src/OT/Layout/GSUB/ReverseChainSingleSubstFormat1.hh",
"externals/harfbuzz/src/OT/Layout/GSUB/Sequence.hh",
"externals/harfbuzz/src/OT/Layout/GSUB/SingleSubst.hh",
"externals/harfbuzz/src/OT/Layout/GSUB/SingleSubstFormat1.hh",
"externals/harfbuzz/src/OT/Layout/GSUB/SingleSubstFormat2.hh",
"externals/harfbuzz/src/OT/Layout/GSUB/SubstLookup.hh",
"externals/harfbuzz/src/OT/Layout/GSUB/SubstLookupSubTable.hh",
"externals/harfbuzz/src/hb-aat-layout-ankr-table.hh",
"externals/harfbuzz/src/hb-aat-layout-bsln-table.hh",
"externals/harfbuzz/src/hb-aat-layout-common.hh",