Skip to content

Upgrade to Bazel 9 #2276

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
palfrey wants to merge 4 commits into from
Closed

Upgrade to Bazel 9 #2276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bce54a4
Upgrade to Bazel 9
palfrey Apr 14, 2026
ecc289b
Musl has issues with some of the Bazel 9 toolchains, so use glibc
palfrey Apr 27, 2026
8054ca8
Bazel 9.1.0
palfrey Apr 29, 2026
e66c48f
Fixes for Bazel 9.1.0
palfrey Apr 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .bazelversion
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8.2.1
9.1.0
3 changes: 1 addition & 2 deletions MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
module(
name = "nativelink",
version = "1.0.0",
compatibility_level = 0,
)

bazel_dep(name = "rules_cc", version = "0.2.8")
bazel_dep(name = "rules_cc", version = "0.2.17")
bazel_dep(name = "platforms", version = "1.0.0")
bazel_dep(name = "bazel_skylib", version = "1.8.2")
bazel_dep(name = "rules_python", version = "2.0.0")
Expand Down
2,028 changes: 267 additions & 1,761 deletions MODULE.bazel.lock
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 2 additions & 3 deletions local-remote-execution/MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,15 @@
module(
name = "local-remote-execution",
version = "0.0.0",
compatibility_level = 0,
)

bazel_dep(name = "platforms", version = "1.0.0")

# Use the starlark implementation of C++ rules instead of the builtin ones.
bazel_dep(name = "rules_cc", version = "0.2.8")
bazel_dep(name = "rules_cc", version = "0.2.17")

# Use the starlark implementation of Java rules instead of the builtin ones.
bazel_dep(name = "rules_java", version = "8.11.0")
bazel_dep(name = "rules_java", version = "9.1.0")
bazel_dep(name = "rules_rust", version = "0.68.1")
bazel_dep(name = "bazel_skylib", version = "1.8.2")

Expand Down
4 changes: 2 additions & 2 deletions local-remote-execution/flake-module.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,9 @@
in
{
"aarch64-darwin" = "aarch64-apple-darwin";
"aarch64-linux" = "aarch64-unknown-linux-musl";
"aarch64-linux" = "aarch64-unknown-linux-gnu";
"x86_64-darwin" = "x86_64-apple-darwin";
"x86_64-linux" = "x86_64-unknown-linux-musl";
"x86_64-linux" = "x86_64-unknown-linux-gnu";
Copy link
Copy Markdown
Member Author

@palfrey palfrey Apr 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not totally sure about this one, but it does make it build

}.${
system
} or (throw "Unsupported Nix target platform: ${system}");
Expand Down
1 change: 0 additions & 1 deletion local-remote-execution/generated-cc/cc/armeabi_cc_toolchain_config.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,5 +79,4 @@ def _impl(ctx):
armeabi_cc_toolchain_config = rule(
implementation = _impl,
attrs = {},
provides = [CcToolchainConfigInfo],
)
1 change: 0 additions & 1 deletion local-remote-execution/generated-cc/cc/cc_toolchain_config.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1703,5 +1703,4 @@ cc_toolchain_config = rule(
)),
},
fragments = ["apple", "cpp"],
provides = [CcToolchainConfigInfo],
)
2 changes: 1 addition & 1 deletion local-remote-execution/generated-cc/config/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,5 @@ platform(
"container-image": "docker://lre-cc:zms5771rx1yqb4wd6qbj5f9sb2paq75k",
"OSFamily": "Linux",
},
parents = ["@local_config_platform//:host"],
parents = ["@platforms//host"],
Copy link
Copy Markdown
Member Author

@palfrey palfrey Apr 14, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because of bazelbuild/bazel#26182

)
2 changes: 1 addition & 1 deletion local-remote-execution/generated-java/config/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ platform(
"container-image": "docker://lre-java:ym272rns245alxpq07dwc65jvh0mpy74",
"OSFamily": "Linux",
},
parents = ["@local_config_platform//:host"],
parents = ["@platforms//host"],
)
2 changes: 1 addition & 1 deletion templates/bazel/.bazelversion
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8.2.1
9.1.0
3 changes: 1 addition & 2 deletions templates/bazel/MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
module(
name = "nativelink-bazel-template",
version = "0",
compatibility_level = 0,
)

# Keep the commit in sync with the NativeLink input from `flake.nix`.
Expand All @@ -13,4 +12,4 @@ archive_override(
urls = ["https://github.com/TraceMachina/nativelink/archive/f9ff630e09a3c22d6a3abea68d1bacc775eac6bb.zip"],
)

bazel_dep(name = "rules_cc", version = "0.2.8")
bazel_dep(name = "rules_cc", version = "0.2.17")
2 changes: 1 addition & 1 deletion toolchain-examples/.bazelversion
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8.1.1
9.1.0
18 changes: 4 additions & 14 deletions toolchain-examples/MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
module(
name = "toolchain-examples",
version = "0.0.0",
compatibility_level = 0,
)

bazel_dep(name = "platforms", version = "1.0.0")

# C++
bazel_dep(name = "rules_cc", version = "0.2.8")
bazel_dep(name = "rules_cc", version = "0.2.17")

# Java
bazel_dep(name = "rules_java", version = "8.11.0")
bazel_dep(name = "rules_java", version = "9.1.0")

java = use_extension("//java:extensions.bzl", "toolchains")
use_repo(java, "local_jdk")
Expand All @@ -34,16 +33,7 @@ python.toolchain(
use_repo(pip, "pip")

# Go
bazel_dep(name = "rules_go", version = "0.57.0")

# Adds https://github.com/bazel-contrib/rules_go/commit/74199c92e20399b6ef46684b2c6fdd94b50a7892
# to fix bash issues with Nix
archive_override(
module_name = "rules_go",
integrity = "sha256-ukyyC80j4VhRCD7DOaenkk41Vvnmsp7uAfHr4lxdXtQ=",
strip_prefix = "rules_go-74199c92e20399b6ef46684b2c6fdd94b50a7892",
urls = ["https://github.com/bazel-contrib/rules_go/archive/74199c92e20399b6ef46684b2c6fdd94b50a7892.zip"],
)
bazel_dep(name = "rules_go", version = "0.59.0")

# Rust
bazel_dep(name = "rules_rust", version = "0.68.1")
Expand Down Expand Up @@ -88,7 +78,7 @@ bazel_dep(name = "curl", version = "8.8.0.bcr.3")
bazel_dep(name = "zstd", version = "1.5.7")

# Abseil for C++
bazel_dep(name = "abseil-cpp", version = "20250512.1")
bazel_dep(name = "abseil-cpp", version = "20250814.1")

# Abseil for python
bazel_dep(name = "abseil-py", version = "2.1.0")
Expand Down
370 changes: 260 additions & 110 deletions toolchain-examples/MODULE.bazel.lock
View file
Open in desktop

Large diffs are not rendered by default.

Loading