Skip to content

Commit 742c985

Browse files
authored
Fix various Bazel warnings after 24cbbfd (#1621)
1 parent e465f73 commit 742c985

File tree

7 files changed

+100
-26
lines changed

7 files changed

+100
-26
lines changed

MODULE.bazel

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ module(
44
compatibility_level = 0,
55
)
66

7-
bazel_dep(name = "rules_cc", version = "0.0.17")
7+
bazel_dep(name = "rules_cc", version = "0.1.1")
88
bazel_dep(name = "platforms", version = "0.0.11")
99
bazel_dep(name = "bazel_skylib", version = "1.7.1")
1010
bazel_dep(name = "rules_python", version = "1.2.0")
@@ -19,14 +19,14 @@ python.toolchain(
1919
)
2020
use_repo(python, python = "python_versions")
2121

22-
bazel_dep(name = "rules_rust", version = "0.59.0")
22+
bazel_dep(name = "rules_rust", version = "0.59.1")
2323
archive_override(
2424
module_name = "rules_rust",
25-
integrity = "sha256-5r/V1RM4MrwTyaV9c+Zs9el3XGbjJOjni6Bg8XWWs/4=",
25+
integrity = "sha256-N37buXa2l1U9N3VmNH3Qv/xd8PxX6TsdLBCM9F497Ac=",
2626
patch_strip = 1,
2727
patches = ["//tools:rules_rust-musl-platforms.diff"],
2828
urls = [
29-
"https://github.com/bazelbuild/rules_rust/releases/download/0.59.0/rules_rust-0.59.0.tar.gz",
29+
"https://github.com/bazelbuild/rules_rust/releases/download/0.59.1/rules_rust-0.59.1.tar.gz",
3030
],
3131
)
3232

local-remote-execution/MODULE.bazel

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ module(
77
compatibility_level = 0,
88
)
99

10-
bazel_dep(name = "platforms", version = "0.0.10")
10+
bazel_dep(name = "platforms", version = "0.0.11")
1111

1212
# Use the starlark implementation of C++ rules instead of the builtin ones.
13-
bazel_dep(name = "rules_cc", version = "0.0.17")
13+
bazel_dep(name = "rules_cc", version = "0.1.1")
1414

1515
# Use the starlark implementation of Java rules instead of the builtin ones.
16-
bazel_dep(name = "rules_java", version = "8.5.1")
17-
bazel_dep(name = "rules_rust", version = "0.54.1")
16+
bazel_dep(name = "rules_java", version = "8.11.0")
17+
bazel_dep(name = "rules_rust", version = "0.59.1")
1818
bazel_dep(name = "bazel_skylib", version = "1.7.1")
1919

2020
lre_rs = use_extension("//rust:extension.bzl", "lre_rs")

modules/nativelink.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"--remote_header=x-nativelink-project=nativelink-ci"
2121
"--nogenerate_json_trace_profile"
2222
"--remote_upload_local_results=false"
23-
"--experimental_remote_cache_async"
23+
"--remote_cache_async"
2424
];
2525

2626
# If the `nativelink.settings.prefix` is set to a nonempty string,

toolchain-examples/.bazelrc

+67-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,73 @@ build --@rules_python//python/config_settings:bootstrap_impl=script
66

77
# Toolchain to verify remote execution with zig-cc.
88
build:zig-cc --platforms @zig_sdk//platform:linux_amd64
9-
build:zig-cc --extra_toolchains @zig_sdk//toolchain:linux_amd64_gnu.2.38
9+
build:zig-cc --platforms @zig_sdk//platform:linux_amd64
10+
11+
# These toolchains map out everything in
12+
# https://github.com/uber/hermetic_cc_toolchain/blob/bfc407599e503a44928a3cefad27421c9341eff0/MODULE.bazel#L44
13+
#
14+
# TODO(aaronmondal): Change this after the next release that contains
15+
# https://github.com/uber/hermetic_cc_toolchain/commit/892973baa37ee1cb7adc8e5b0f75e1966093b1d3
16+
build:zig-cc --extra_toolchains @zig_sdk-linux-amd64//toolchain:linux_amd64_gnu.2.28
17+
build:zig-cc --extra_toolchains @zig_sdk-linux-amd64//toolchain:linux_arm64_gnu.2.28
18+
build:zig-cc --extra_toolchains @zig_sdk-linux-amd64//toolchain:windows_amd64
19+
build:zig-cc --extra_toolchains @zig_sdk-linux-amd64//toolchain:windows_arm64
20+
# build:zig-cc --extra_toolchains @zig_sdk-linux-amd64//toolchain:darwin_amd64
21+
# build:zig-cc --extra_toolchains @zig_sdk-linux-amd64//toolchain:darwin_arm64
22+
build:zig-cc --extra_toolchains @zig_sdk-linux-amd64//libc_aware/toolchain:linux_amd64_gnu.2.28
23+
build:zig-cc --extra_toolchains @zig_sdk-linux-amd64//libc_aware/toolchain:linux_amd64_gnu.2.31
24+
build:zig-cc --extra_toolchains @zig_sdk-linux-amd64//libc_aware/toolchain:linux_amd64_musl
25+
build:zig-cc --extra_toolchains @zig_sdk-linux-amd64//libc_aware/toolchain:linux_arm64_gnu.2.28
26+
build:zig-cc --extra_toolchains @zig_sdk-linux-amd64//libc_aware/toolchain:linux_arm64_musl
27+
build:zig-cc --extra_toolchains @zig_sdk-linux-amd64//toolchain:wasip1_wasm
28+
build:zig-cc --extra_toolchains @zig_sdk-linux-arm64//toolchain:linux_amd64_gnu.2.28
29+
build:zig-cc --extra_toolchains @zig_sdk-linux-arm64//toolchain:linux_arm64_gnu.2.28
30+
build:zig-cc --extra_toolchains @zig_sdk-linux-arm64//toolchain:windows_amd64
31+
build:zig-cc --extra_toolchains @zig_sdk-linux-arm64//toolchain:windows_arm64
32+
# build:zig-cc --extra_toolchains @zig_sdk-linux-arm64//toolchain:darwin_amd64
33+
# build:zig-cc --extra_toolchains @zig_sdk-linux-arm64//toolchain:darwin_arm64
34+
build:zig-cc --extra_toolchains @zig_sdk-linux-arm64//libc_aware/toolchain:linux_amd64_gnu.2.28
35+
build:zig-cc --extra_toolchains @zig_sdk-linux-arm64//libc_aware/toolchain:linux_amd64_gnu.2.31
36+
build:zig-cc --extra_toolchains @zig_sdk-linux-arm64//libc_aware/toolchain:linux_amd64_musl
37+
build:zig-cc --extra_toolchains @zig_sdk-linux-arm64//libc_aware/toolchain:linux_arm64_gnu.2.28
38+
build:zig-cc --extra_toolchains @zig_sdk-linux-arm64//libc_aware/toolchain:linux_arm64_musl
39+
build:zig-cc --extra_toolchains @zig_sdk-linux-arm64//toolchain:wasip1_wasm
40+
build:zig-cc --extra_toolchains @zig_sdk-windows-amd64//toolchain:linux_amd64_gnu.2.28
41+
build:zig-cc --extra_toolchains @zig_sdk-windows-amd64//toolchain:linux_arm64_gnu.2.28
42+
build:zig-cc --extra_toolchains @zig_sdk-windows-amd64//toolchain:windows_amd64
43+
build:zig-cc --extra_toolchains @zig_sdk-windows-amd64//toolchain:windows_arm64
44+
# build:zig-cc --extra_toolchains @zig_sdk-windows-amd64//toolchain:darwin_amd64
45+
# build:zig-cc --extra_toolchains @zig_sdk-windows-amd64//toolchain:darwin_arm64
46+
build:zig-cc --extra_toolchains @zig_sdk-windows-amd64//libc_aware/toolchain:linux_amd64_gnu.2.28
47+
build:zig-cc --extra_toolchains @zig_sdk-windows-amd64//libc_aware/toolchain:linux_amd64_gnu.2.31
48+
build:zig-cc --extra_toolchains @zig_sdk-windows-amd64//libc_aware/toolchain:linux_amd64_musl
49+
build:zig-cc --extra_toolchains @zig_sdk-windows-amd64//libc_aware/toolchain:linux_arm64_gnu.2.28
50+
build:zig-cc --extra_toolchains @zig_sdk-windows-amd64//libc_aware/toolchain:linux_arm64_musl
51+
build:zig-cc --extra_toolchains @zig_sdk-windows-amd64//toolchain:wasip1_wasm
52+
build:zig-cc --extra_toolchains @zig_sdk-macos-arm64//toolchain:linux_amd64_gnu.2.28
53+
build:zig-cc --extra_toolchains @zig_sdk-macos-arm64//toolchain:linux_arm64_gnu.2.28
54+
build:zig-cc --extra_toolchains @zig_sdk-macos-arm64//toolchain:windows_amd64
55+
build:zig-cc --extra_toolchains @zig_sdk-macos-arm64//toolchain:windows_arm64
56+
# build:zig-cc --extra_toolchains @zig_sdk-macos-arm64//toolchain:darwin_amd64
57+
# build:zig-cc --extra_toolchains @zig_sdk-macos-arm64//toolchain:darwin_arm64
58+
build:zig-cc --extra_toolchains @zig_sdk-macos-arm64//libc_aware/toolchain:linux_amd64_gnu.2.28
59+
build:zig-cc --extra_toolchains @zig_sdk-macos-arm64//libc_aware/toolchain:linux_amd64_gnu.2.31
60+
build:zig-cc --extra_toolchains @zig_sdk-macos-arm64//libc_aware/toolchain:linux_amd64_musl
61+
build:zig-cc --extra_toolchains @zig_sdk-macos-arm64//libc_aware/toolchain:linux_arm64_gnu.2.28
62+
build:zig-cc --extra_toolchains @zig_sdk-macos-arm64//libc_aware/toolchain:linux_arm64_musl
63+
build:zig-cc --extra_toolchains @zig_sdk-macos-arm64//toolchain:wasip1_wasm
64+
build:zig-cc --extra_toolchains @zig_sdk-macos-amd64//toolchain:linux_amd64_gnu.2.28
65+
build:zig-cc --extra_toolchains @zig_sdk-macos-amd64//toolchain:linux_arm64_gnu.2.28
66+
build:zig-cc --extra_toolchains @zig_sdk-macos-amd64//toolchain:windows_amd64
67+
build:zig-cc --extra_toolchains @zig_sdk-macos-amd64//toolchain:windows_arm64
68+
# build:zig-cc --extra_toolchains @zig_sdk-macos-amd64//toolchain:darwin_amd64
69+
# build:zig-cc --extra_toolchains @zig_sdk-macos-amd64//toolchain:darwin_arm64
70+
build:zig-cc --extra_toolchains @zig_sdk-macos-amd64//libc_aware/toolchain:linux_amd64_gnu.2.28
71+
build:zig-cc --extra_toolchains @zig_sdk-macos-amd64//libc_aware/toolchain:linux_amd64_gnu.2.31
72+
build:zig-cc --extra_toolchains @zig_sdk-macos-amd64//libc_aware/toolchain:linux_amd64_musl
73+
build:zig-cc --extra_toolchains @zig_sdk-macos-amd64//libc_aware/toolchain:linux_arm64_gnu.2.28
74+
build:zig-cc --extra_toolchains @zig_sdk-macos-amd64//libc_aware/toolchain:linux_arm64_musl
75+
build:zig-cc --extra_toolchains @zig_sdk-macos-amd64//toolchain:wasip1_wasm
1076

1177
# Toolchain to verify remote execution with contrib/toolchains_llvm.
1278
build:llvm --platforms=@toolchains_llvm//platforms:linux-x86_64

toolchain-examples/.bazelversion

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.4.1
1+
8.1.1

toolchain-examples/MODULE.bazel

+21-13
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@ module(
44
compatibility_level = 0,
55
)
66

7-
bazel_dep(name = "platforms", version = "0.0.10")
7+
bazel_dep(name = "platforms", version = "0.0.11")
88

99
# C++
10-
bazel_dep(name = "rules_cc", version = "0.0.17")
10+
bazel_dep(name = "rules_cc", version = "0.1.1")
1111

1212
# Java
13-
bazel_dep(name = "rules_java", version = "8.5.1")
13+
bazel_dep(name = "rules_java", version = "8.11.0")
1414

1515
java = use_extension("//java:extensions.bzl", "toolchains")
1616
use_repo(java, "local_jdk")
1717

1818
# Python
19-
bazel_dep(name = "rules_python", version = "0.40.0")
19+
bazel_dep(name = "rules_python", version = "1.2.0")
2020

2121
pip = use_extension("@rules_python//python/extensions:pip.bzl", "pip")
2222
pip.parse(
@@ -34,10 +34,10 @@ python.toolchain(
3434
use_repo(pip, "pip")
3535

3636
# Go
37-
bazel_dep(name = "rules_go", version = "0.50.1")
37+
bazel_dep(name = "rules_go", version = "0.53.0")
3838

3939
# Rust
40-
bazel_dep(name = "rules_rust", version = "0.54.1")
40+
bazel_dep(name = "rules_rust", version = "0.59.1")
4141

4242
# C++ toolchain via zig-cc.
4343
#
@@ -47,10 +47,18 @@ bazel_dep(name = "rules_rust", version = "0.54.1")
4747
#
4848
# To test this toolchain, use for use with the config flag `--config=zig-cc`.
4949
#
50-
bazel_dep(name = "hermetic_cc_toolchain", version = "3.1.1")
50+
bazel_dep(name = "hermetic_cc_toolchain", version = "3.2.0")
5151

5252
zig = use_extension("@hermetic_cc_toolchain//toolchain:ext.bzl", "toolchains")
53-
use_repo(zig, "zig_sdk")
53+
use_repo(
54+
zig,
55+
"zig_sdk",
56+
"zig_sdk-linux-amd64",
57+
"zig_sdk-linux-arm64",
58+
"zig_sdk-macos-amd64",
59+
"zig_sdk-macos-arm64",
60+
"zig_sdk-windows-amd64",
61+
)
5462

5563
# C++ toolchain via contrib/toolchains_llvm.
5664
#
@@ -61,7 +69,7 @@ use_repo(zig, "zig_sdk")
6169
#
6270
# To test this toolchain, use for use with the config flag `--config=llvm`.
6371
#
64-
bazel_dep(name = "toolchains_llvm", version = "1.2.0")
72+
bazel_dep(name = "toolchains_llvm", version = "1.3.0")
6573

6674
llvm = use_extension("@toolchains_llvm//toolchain/extensions:llvm.bzl", "llvm")
6775
llvm.toolchain(llvm_version = "19.1.0")
@@ -70,19 +78,19 @@ use_repo(llvm, "llvm_toolchain")
7078
# Example projects to test compilation.
7179

7280
# libcurl (C)
73-
bazel_dep(name = "curl", version = "8.8.0.bcr.1")
81+
bazel_dep(name = "curl", version = "8.8.0.bcr.3")
7482

7583
# Zstandard (C)
76-
bazel_dep(name = "zstd", version = "1.5.6")
84+
bazel_dep(name = "zstd", version = "1.5.7")
7785

7886
# Abseil for C++
79-
bazel_dep(name = "abseil-cpp", version = "20240722.0.bcr.1")
87+
bazel_dep(name = "abseil-cpp", version = "20250127.0")
8088

8189
# Abseil for python
8290
bazel_dep(name = "abseil-py", version = "2.1.0")
8391

8492
# GRPC
85-
bazel_dep(name = "grpc", version = "1.68.0")
93+
bazel_dep(name = "grpc", version = "1.71.0")
8694

8795
# Circl (Go, C++)
8896
bazel_dep(name = "circl", version = "1.3.8")

web/platform/src/content/docs/docs/nativelink-cloud/nix.mdx

+2-2
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ build --remote_instance_name=main
9696
build --remote_header=x-nativelink-project=nativelink-ci
9797
build --nogenerate_json_trace_profile
9898
build --remote_upload_local_results=false
99-
build --experimental_remote_cache_async
99+
build --remote_cache_async
100100
```
101101
102102
:::tip
@@ -118,5 +118,5 @@ build:nativelink --remote_header=x-nativelink-api-key=my-custom-readonly-api-key
118118
build:nativelink --remote_header=x-nativelink-project=nativelink-ci
119119
build:nativelink --nogenerate_json_trace_profile
120120
build:nativelink --remote_upload_local_results=false
121-
build:nativelink --experimental_remote_cache_async
121+
build:nativelink --remote_cache_async
122122
```

0 commit comments

Comments
 (0)