Skip to content

Commit 8e8c16c

Browse files
kjlubickSkCQ
authored andcommitted
Reland "Update to Bazel 7"
This includes: - Fixes to generating our GL interface code similar to http://review.skia.org/862416 - Removal of objc_archive action (see http://review.skia.org/897456) - Fixing missing deps in some tools targets (see comments on http://review.skia.org/897151) In particular this allows us to use https://bazel.build/reference/be/c-cpp#cc_library.implementation_deps Note that to update to Bazel 8, we will need to migrate to Bazel modules https://bazel.build/external/overview#bzlmod We do have to disable some tests that start failing, not because anything changed with how the C++ code was made, but with how the Bazel rules make files available. We don't have the staffing to investigate these thoroughly at the moment, so I've disabled the Bazel testing of CanvasKit (we still do BazelBuild) and the experimental Bazel-test-on-android rules. Change-Id: Ib98d9b5145c8102964a2aa56ff55505ee3c8ea6f Reviewed-on: https://skia-review.googlesource.com/c/skia/+/897719 Reviewed-by: Ben Wagner <[email protected]> Commit-Queue: Kaylee Lubick <[email protected]>
1 parent d211141 commit 8e8c16c

File tree

12 files changed

+140
-307
lines changed

12 files changed

+140
-307
lines changed

.bazelrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ build:remote --java_runtime_version=rbe_jdk
9090
build:remote --tool_java_runtime_version=rbe_jdk
9191

9292
# When a remote configuration is chosen, add "remote" to the list of spawn_strategies.
93-
build:remote --spawn_strategy=remote,sandboxed
93+
build:remote --spawn_strategy=remote,sandboxed,local
9494

9595
# Enable remote execution so actions are performed on the remote systems.
9696
build:remote --remote_executor=grpcs://remotebuildexecution.googleapis.com

.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6.3.2
1+
7.3.1

MODULE.bazel

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
###############################################################################
2+
# Bazel now uses Bzlmod by default to manage external dependencies.
3+
# Please consider migrating your external dependencies from WORKSPACE to MODULE.bazel.
4+
#
5+
# For more details, please check https://github.com/bazelbuild/bazel/issues/18958
6+
###############################################################################
7+
# TODO(kjlubick) set up modules

MODULE.bazel.lock

Lines changed: 110 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

infra/bots/jobs.json

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,6 @@
2626
"cq_config": {}
2727
},
2828
{"name": "BazelBuild-viewer-release-linux_x64"},
29-
{"name": "BazelTest-canvaskit_gold-modules_canvaskit_js_tests-ck_full_cpu_release_chrome-linux_x64",
30-
"cq_config": {"location_regexes": ["modules/canvaskit/.*"]}
31-
},
32-
{"name": "BazelTest-canvaskit_gold-modules_canvaskit_js_tests-ck_full_webgl2_release_chrome-linux_x64",
33-
"cq_config": {"location_regexes": ["modules/canvaskit/.*"]}
34-
},
3529
{"name": "BazelTest-gm-cpu_gms-cpu_only_debug_rbe-linux_x64-NUC9i7QN_Debian11",
3630
"cq_config": {}
3731
},
@@ -56,15 +50,6 @@
5650
{"name": "BazelTest-cpu_tests-all_tests-cpu_only_debug_rbe-linux_x64",
5751
"cq_config": {"experimental": true}
5852
},
59-
{"name": "BazelTest-precompiled_benchmark-cpu_8888_benchmark_android_test-for_android_arm64_release-on_rpi-Pixel5_Android12",
60-
"cq_config": {"experimental": true}
61-
},
62-
{"name": "BazelTest-precompiled_gm-hello_bazel_world_android_test-for_android_arm64_release-on_rpi-Pixel5_Android12",
63-
"cq_config": {"experimental": true}
64-
},
65-
{"name": "BazelTest-precompiled_test-android_math_test-for_android_arm64_release-on_rpi-Pixel5_Android12",
66-
"cq_config": {"experimental": true}
67-
},
6853
{"name": "Build-Debian11-GCC-x86-Debug-Docker"},
6954
{"name": "Build-Debian11-GCC-x86-Release-Docker"},
7055
{"name": "Build-Debian11-GCC-x86_64-Debug-Docker",

0 commit comments

Comments
 (0)