Skip to content

Commit 24cbbfd

Browse files
aaronmondalaaronmondal
authored
Migrate to Bazel 8 (#1618)
1 parent fa64033 commit 24cbbfd

File tree

7 files changed

+49
-49
lines changed

7 files changed

+49
-49
lines changed

‎.bazelversion‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.4.1
1+
8.1.1

‎MODULE.bazel‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ module(
77
bazel_dep(name = "rules_cc", version = "0.0.17")
88
bazel_dep(name = "platforms", version = "0.0.11")
99
bazel_dep(name = "bazel_skylib", version = "1.7.1")
10-
bazel_dep(name = "rules_python", version = "1.0.0")
10+
bazel_dep(name = "rules_python", version = "1.2.0")
1111

1212
python = use_extension("@rules_python//python/extensions:python.bzl", "python")
1313
python.toolchain(
@@ -19,14 +19,14 @@ python.toolchain(
1919
)
2020
use_repo(python, python = "python_versions")
2121

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

@@ -105,12 +105,12 @@ rust.toolchain(
105105
)
106106
use_repo(rust, "rust_toolchains")
107107

108-
bazel_dep(name = "toolchains_protoc", version = "0.3.6")
108+
bazel_dep(name = "toolchains_protoc", version = "0.3.7")
109109

110110
protoc = use_extension("@toolchains_protoc//protoc:extensions.bzl", "protoc")
111111
protoc.toolchain(
112112
google_protobuf = "com_google_protobuf",
113-
version = "v28.0",
113+
version = "v29.3",
114114
)
115115

116116
# Local remote execution.

‎local-remote-execution/overlays/lre-rs.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
${" "} "lib/rustlib/${target}/codegen-backends/*.so",
5959
${" "} "lib/rustlib/${target}/bin/rust-lld",
6060
${" "} "lib/rustlib/${target}/lib/*.so",
61-
${" "} ]),'';
61+
${" "} ], allow_empty = True),'';
6262

6363
# Generate stdlib select entry for a target
6464
mkStdlibSelectEntry = target:
@@ -69,7 +69,7 @@
6969
${" "} "lib/rustlib/${target}/lib/*.a",''
7070
+ (lib.optionalString (builtins.match ".*-musl" target != null)
7171
''${"\n "} "lib/rustlib/${target}/lib/self-contained/**",'')
72-
+ ''${"\n "} ]),'';
72+
+ ''${"\n "} ], allow_empty = True),'';
7373

7474
selectEntries = builtins.concatStringsSep "\n" (map mkSelectEntry rustTargets);
7575
stdlibSelectEntries = builtins.concatStringsSep "\n" (map mkStdlibSelectEntry rustTargets);

‎local-remote-execution/rust/aarch64-darwin.BUILD.bazel‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -45,42 +45,42 @@ filegroup(
4545
"lib/rustlib/aarch64-apple-darwin/codegen-backends/*.so",
4646
"lib/rustlib/aarch64-apple-darwin/bin/rust-lld",
4747
"lib/rustlib/aarch64-apple-darwin/lib/*.so",
48-
]),
48+
], allow_empty = True),
4949
"@local-remote-execution//rust/triple:aarch64-unknown-linux-gnu": glob([
5050
"bin/*.so",
5151
"lib/*.so",
5252
"lib/rustlib/aarch64-unknown-linux-gnu/codegen-backends/*.so",
5353
"lib/rustlib/aarch64-unknown-linux-gnu/bin/rust-lld",
5454
"lib/rustlib/aarch64-unknown-linux-gnu/lib/*.so",
55-
]),
55+
], allow_empty = True),
5656
"@local-remote-execution//rust/triple:aarch64-unknown-linux-musl": glob([
5757
"bin/*.so",
5858
"lib/*.so",
5959
"lib/rustlib/aarch64-unknown-linux-musl/codegen-backends/*.so",
6060
"lib/rustlib/aarch64-unknown-linux-musl/bin/rust-lld",
6161
"lib/rustlib/aarch64-unknown-linux-musl/lib/*.so",
62-
]),
62+
], allow_empty = True),
6363
"@local-remote-execution//rust/triple:x86_64-apple-darwin": glob([
6464
"bin/*.so",
6565
"lib/*.so",
6666
"lib/rustlib/x86_64-apple-darwin/codegen-backends/*.so",
6767
"lib/rustlib/x86_64-apple-darwin/bin/rust-lld",
6868
"lib/rustlib/x86_64-apple-darwin/lib/*.so",
69-
]),
69+
], allow_empty = True),
7070
"@local-remote-execution//rust/triple:x86_64-unknown-linux-gnu": glob([
7171
"bin/*.so",
7272
"lib/*.so",
7373
"lib/rustlib/x86_64-unknown-linux-gnu/codegen-backends/*.so",
7474
"lib/rustlib/x86_64-unknown-linux-gnu/bin/rust-lld",
7575
"lib/rustlib/x86_64-unknown-linux-gnu/lib/*.so",
76-
]),
76+
], allow_empty = True),
7777
"@local-remote-execution//rust/triple:x86_64-unknown-linux-musl": glob([
7878
"bin/*.so",
7979
"lib/*.so",
8080
"lib/rustlib/x86_64-unknown-linux-musl/codegen-backends/*.so",
8181
"lib/rustlib/x86_64-unknown-linux-musl/bin/rust-lld",
8282
"lib/rustlib/x86_64-unknown-linux-musl/lib/*.so",
83-
]),
83+
], allow_empty = True),
8484
}),
8585
visibility = ["//visibility:public"],
8686
)
@@ -92,34 +92,34 @@ rust_stdlib_filegroup(
9292
"lib/rustlib/aarch64-apple-darwin/lib/*.rlib",
9393
"lib/rustlib/aarch64-apple-darwin/lib/*.so",
9494
"lib/rustlib/aarch64-apple-darwin/lib/*.a",
95-
]),
95+
], allow_empty = True),
9696
"@local-remote-execution//rust/triple:aarch64-unknown-linux-gnu": glob([
9797
"lib/rustlib/aarch64-unknown-linux-gnu/lib/*.rlib",
9898
"lib/rustlib/aarch64-unknown-linux-gnu/lib/*.so",
9999
"lib/rustlib/aarch64-unknown-linux-gnu/lib/*.a",
100-
]),
100+
], allow_empty = True),
101101
"@local-remote-execution//rust/triple:aarch64-unknown-linux-musl": glob([
102102
"lib/rustlib/aarch64-unknown-linux-musl/lib/*.rlib",
103103
"lib/rustlib/aarch64-unknown-linux-musl/lib/*.so",
104104
"lib/rustlib/aarch64-unknown-linux-musl/lib/*.a",
105105
"lib/rustlib/aarch64-unknown-linux-musl/lib/self-contained/**",
106-
]),
106+
], allow_empty = True),
107107
"@local-remote-execution//rust/triple:x86_64-apple-darwin": glob([
108108
"lib/rustlib/x86_64-apple-darwin/lib/*.rlib",
109109
"lib/rustlib/x86_64-apple-darwin/lib/*.so",
110110
"lib/rustlib/x86_64-apple-darwin/lib/*.a",
111-
]),
111+
], allow_empty = True),
112112
"@local-remote-execution//rust/triple:x86_64-unknown-linux-gnu": glob([
113113
"lib/rustlib/x86_64-unknown-linux-gnu/lib/*.rlib",
114114
"lib/rustlib/x86_64-unknown-linux-gnu/lib/*.so",
115115
"lib/rustlib/x86_64-unknown-linux-gnu/lib/*.a",
116-
]),
116+
], allow_empty = True),
117117
"@local-remote-execution//rust/triple:x86_64-unknown-linux-musl": glob([
118118
"lib/rustlib/x86_64-unknown-linux-musl/lib/*.rlib",
119119
"lib/rustlib/x86_64-unknown-linux-musl/lib/*.so",
120120
"lib/rustlib/x86_64-unknown-linux-musl/lib/*.a",
121121
"lib/rustlib/x86_64-unknown-linux-musl/lib/self-contained/**",
122-
]),
122+
], allow_empty = True),
123123
}),
124124
visibility = ["//visibility:public"],
125125
)

‎local-remote-execution/rust/aarch64-linux.BUILD.bazel‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,28 +45,28 @@ filegroup(
4545
"lib/rustlib/aarch64-unknown-linux-gnu/codegen-backends/*.so",
4646
"lib/rustlib/aarch64-unknown-linux-gnu/bin/rust-lld",
4747
"lib/rustlib/aarch64-unknown-linux-gnu/lib/*.so",
48-
]),
48+
], allow_empty = True),
4949
"@local-remote-execution//rust/triple:aarch64-unknown-linux-musl": glob([
5050
"bin/*.so",
5151
"lib/*.so",
5252
"lib/rustlib/aarch64-unknown-linux-musl/codegen-backends/*.so",
5353
"lib/rustlib/aarch64-unknown-linux-musl/bin/rust-lld",
5454
"lib/rustlib/aarch64-unknown-linux-musl/lib/*.so",
55-
]),
55+
], allow_empty = True),
5656
"@local-remote-execution//rust/triple:x86_64-unknown-linux-gnu": glob([
5757
"bin/*.so",
5858
"lib/*.so",
5959
"lib/rustlib/x86_64-unknown-linux-gnu/codegen-backends/*.so",
6060
"lib/rustlib/x86_64-unknown-linux-gnu/bin/rust-lld",
6161
"lib/rustlib/x86_64-unknown-linux-gnu/lib/*.so",
62-
]),
62+
], allow_empty = True),
6363
"@local-remote-execution//rust/triple:x86_64-unknown-linux-musl": glob([
6464
"bin/*.so",
6565
"lib/*.so",
6666
"lib/rustlib/x86_64-unknown-linux-musl/codegen-backends/*.so",
6767
"lib/rustlib/x86_64-unknown-linux-musl/bin/rust-lld",
6868
"lib/rustlib/x86_64-unknown-linux-musl/lib/*.so",
69-
]),
69+
], allow_empty = True),
7070
}),
7171
visibility = ["//visibility:public"],
7272
)
@@ -78,24 +78,24 @@ rust_stdlib_filegroup(
7878
"lib/rustlib/aarch64-unknown-linux-gnu/lib/*.rlib",
7979
"lib/rustlib/aarch64-unknown-linux-gnu/lib/*.so",
8080
"lib/rustlib/aarch64-unknown-linux-gnu/lib/*.a",
81-
]),
81+
], allow_empty = True),
8282
"@local-remote-execution//rust/triple:aarch64-unknown-linux-musl": glob([
8383
"lib/rustlib/aarch64-unknown-linux-musl/lib/*.rlib",
8484
"lib/rustlib/aarch64-unknown-linux-musl/lib/*.so",
8585
"lib/rustlib/aarch64-unknown-linux-musl/lib/*.a",
8686
"lib/rustlib/aarch64-unknown-linux-musl/lib/self-contained/**",
87-
]),
87+
], allow_empty = True),
8888
"@local-remote-execution//rust/triple:x86_64-unknown-linux-gnu": glob([
8989
"lib/rustlib/x86_64-unknown-linux-gnu/lib/*.rlib",
9090
"lib/rustlib/x86_64-unknown-linux-gnu/lib/*.so",
9191
"lib/rustlib/x86_64-unknown-linux-gnu/lib/*.a",
92-
]),
92+
], allow_empty = True),
9393
"@local-remote-execution//rust/triple:x86_64-unknown-linux-musl": glob([
9494
"lib/rustlib/x86_64-unknown-linux-musl/lib/*.rlib",
9595
"lib/rustlib/x86_64-unknown-linux-musl/lib/*.so",
9696
"lib/rustlib/x86_64-unknown-linux-musl/lib/*.a",
9797
"lib/rustlib/x86_64-unknown-linux-musl/lib/self-contained/**",
98-
]),
98+
], allow_empty = True),
9999
}),
100100
visibility = ["//visibility:public"],
101101
)

‎local-remote-execution/rust/x86_64-darwin.BUILD.bazel‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -45,42 +45,42 @@ filegroup(
4545
"lib/rustlib/aarch64-apple-darwin/codegen-backends/*.so",
4646
"lib/rustlib/aarch64-apple-darwin/bin/rust-lld",
4747
"lib/rustlib/aarch64-apple-darwin/lib/*.so",
48-
]),
48+
], allow_empty = True),
4949
"@local-remote-execution//rust/triple:aarch64-unknown-linux-gnu": glob([
5050
"bin/*.so",
5151
"lib/*.so",
5252
"lib/rustlib/aarch64-unknown-linux-gnu/codegen-backends/*.so",
5353
"lib/rustlib/aarch64-unknown-linux-gnu/bin/rust-lld",
5454
"lib/rustlib/aarch64-unknown-linux-gnu/lib/*.so",
55-
]),
55+
], allow_empty = True),
5656
"@local-remote-execution//rust/triple:aarch64-unknown-linux-musl": glob([
5757
"bin/*.so",
5858
"lib/*.so",
5959
"lib/rustlib/aarch64-unknown-linux-musl/codegen-backends/*.so",
6060
"lib/rustlib/aarch64-unknown-linux-musl/bin/rust-lld",
6161
"lib/rustlib/aarch64-unknown-linux-musl/lib/*.so",
62-
]),
62+
], allow_empty = True),
6363
"@local-remote-execution//rust/triple:x86_64-apple-darwin": glob([
6464
"bin/*.so",
6565
"lib/*.so",
6666
"lib/rustlib/x86_64-apple-darwin/codegen-backends/*.so",
6767
"lib/rustlib/x86_64-apple-darwin/bin/rust-lld",
6868
"lib/rustlib/x86_64-apple-darwin/lib/*.so",
69-
]),
69+
], allow_empty = True),
7070
"@local-remote-execution//rust/triple:x86_64-unknown-linux-gnu": glob([
7171
"bin/*.so",
7272
"lib/*.so",
7373
"lib/rustlib/x86_64-unknown-linux-gnu/codegen-backends/*.so",
7474
"lib/rustlib/x86_64-unknown-linux-gnu/bin/rust-lld",
7575
"lib/rustlib/x86_64-unknown-linux-gnu/lib/*.so",
76-
]),
76+
], allow_empty = True),
7777
"@local-remote-execution//rust/triple:x86_64-unknown-linux-musl": glob([
7878
"bin/*.so",
7979
"lib/*.so",
8080
"lib/rustlib/x86_64-unknown-linux-musl/codegen-backends/*.so",
8181
"lib/rustlib/x86_64-unknown-linux-musl/bin/rust-lld",
8282
"lib/rustlib/x86_64-unknown-linux-musl/lib/*.so",
83-
]),
83+
], allow_empty = True),
8484
}),
8585
visibility = ["//visibility:public"],
8686
)
@@ -92,34 +92,34 @@ rust_stdlib_filegroup(
9292
"lib/rustlib/aarch64-apple-darwin/lib/*.rlib",
9393
"lib/rustlib/aarch64-apple-darwin/lib/*.so",
9494
"lib/rustlib/aarch64-apple-darwin/lib/*.a",
95-
]),
95+
], allow_empty = True),
9696
"@local-remote-execution//rust/triple:aarch64-unknown-linux-gnu": glob([
9797
"lib/rustlib/aarch64-unknown-linux-gnu/lib/*.rlib",
9898
"lib/rustlib/aarch64-unknown-linux-gnu/lib/*.so",
9999
"lib/rustlib/aarch64-unknown-linux-gnu/lib/*.a",
100-
]),
100+
], allow_empty = True),
101101
"@local-remote-execution//rust/triple:aarch64-unknown-linux-musl": glob([
102102
"lib/rustlib/aarch64-unknown-linux-musl/lib/*.rlib",
103103
"lib/rustlib/aarch64-unknown-linux-musl/lib/*.so",
104104
"lib/rustlib/aarch64-unknown-linux-musl/lib/*.a",
105105
"lib/rustlib/aarch64-unknown-linux-musl/lib/self-contained/**",
106-
]),
106+
], allow_empty = True),
107107
"@local-remote-execution//rust/triple:x86_64-apple-darwin": glob([
108108
"lib/rustlib/x86_64-apple-darwin/lib/*.rlib",
109109
"lib/rustlib/x86_64-apple-darwin/lib/*.so",
110110
"lib/rustlib/x86_64-apple-darwin/lib/*.a",
111-
]),
111+
], allow_empty = True),
112112
"@local-remote-execution//rust/triple:x86_64-unknown-linux-gnu": glob([
113113
"lib/rustlib/x86_64-unknown-linux-gnu/lib/*.rlib",
114114
"lib/rustlib/x86_64-unknown-linux-gnu/lib/*.so",
115115
"lib/rustlib/x86_64-unknown-linux-gnu/lib/*.a",
116-
]),
116+
], allow_empty = True),
117117
"@local-remote-execution//rust/triple:x86_64-unknown-linux-musl": glob([
118118
"lib/rustlib/x86_64-unknown-linux-musl/lib/*.rlib",
119119
"lib/rustlib/x86_64-unknown-linux-musl/lib/*.so",
120120
"lib/rustlib/x86_64-unknown-linux-musl/lib/*.a",
121121
"lib/rustlib/x86_64-unknown-linux-musl/lib/self-contained/**",
122-
]),
122+
], allow_empty = True),
123123
}),
124124
visibility = ["//visibility:public"],
125125
)

‎local-remote-execution/rust/x86_64-linux.BUILD.bazel‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,28 +45,28 @@ filegroup(
4545
"lib/rustlib/aarch64-unknown-linux-gnu/codegen-backends/*.so",
4646
"lib/rustlib/aarch64-unknown-linux-gnu/bin/rust-lld",
4747
"lib/rustlib/aarch64-unknown-linux-gnu/lib/*.so",
48-
]),
48+
], allow_empty = True),
4949
"@local-remote-execution//rust/triple:aarch64-unknown-linux-musl": glob([
5050
"bin/*.so",
5151
"lib/*.so",
5252
"lib/rustlib/aarch64-unknown-linux-musl/codegen-backends/*.so",
5353
"lib/rustlib/aarch64-unknown-linux-musl/bin/rust-lld",
5454
"lib/rustlib/aarch64-unknown-linux-musl/lib/*.so",
55-
]),
55+
], allow_empty = True),
5656
"@local-remote-execution//rust/triple:x86_64-unknown-linux-gnu": glob([
5757
"bin/*.so",
5858
"lib/*.so",
5959
"lib/rustlib/x86_64-unknown-linux-gnu/codegen-backends/*.so",
6060
"lib/rustlib/x86_64-unknown-linux-gnu/bin/rust-lld",
6161
"lib/rustlib/x86_64-unknown-linux-gnu/lib/*.so",
62-
]),
62+
], allow_empty = True),
6363
"@local-remote-execution//rust/triple:x86_64-unknown-linux-musl": glob([
6464
"bin/*.so",
6565
"lib/*.so",
6666
"lib/rustlib/x86_64-unknown-linux-musl/codegen-backends/*.so",
6767
"lib/rustlib/x86_64-unknown-linux-musl/bin/rust-lld",
6868
"lib/rustlib/x86_64-unknown-linux-musl/lib/*.so",
69-
]),
69+
], allow_empty = True),
7070
}),
7171
visibility = ["//visibility:public"],
7272
)
@@ -78,24 +78,24 @@ rust_stdlib_filegroup(
7878
"lib/rustlib/aarch64-unknown-linux-gnu/lib/*.rlib",
7979
"lib/rustlib/aarch64-unknown-linux-gnu/lib/*.so",
8080
"lib/rustlib/aarch64-unknown-linux-gnu/lib/*.a",
81-
]),
81+
], allow_empty = True),
8282
"@local-remote-execution//rust/triple:aarch64-unknown-linux-musl": glob([
8383
"lib/rustlib/aarch64-unknown-linux-musl/lib/*.rlib",
8484
"lib/rustlib/aarch64-unknown-linux-musl/lib/*.so",
8585
"lib/rustlib/aarch64-unknown-linux-musl/lib/*.a",
8686
"lib/rustlib/aarch64-unknown-linux-musl/lib/self-contained/**",
87-
]),
87+
], allow_empty = True),
8888
"@local-remote-execution//rust/triple:x86_64-unknown-linux-gnu": glob([
8989
"lib/rustlib/x86_64-unknown-linux-gnu/lib/*.rlib",
9090
"lib/rustlib/x86_64-unknown-linux-gnu/lib/*.so",
9191
"lib/rustlib/x86_64-unknown-linux-gnu/lib/*.a",
92-
]),
92+
], allow_empty = True),
9393
"@local-remote-execution//rust/triple:x86_64-unknown-linux-musl": glob([
9494
"lib/rustlib/x86_64-unknown-linux-musl/lib/*.rlib",
9595
"lib/rustlib/x86_64-unknown-linux-musl/lib/*.so",
9696
"lib/rustlib/x86_64-unknown-linux-musl/lib/*.a",
9797
"lib/rustlib/x86_64-unknown-linux-musl/lib/self-contained/**",
98-
]),
98+
], allow_empty = True),
9999
}),
100100
visibility = ["//visibility:public"],
101101
)

0 commit comments

Comments
 (0)