|
1 | 1 | module(name = "com_github_buildbarn_bb_deployments") |
2 | 2 |
|
3 | 3 | bazel_dep(name = "abseil-cpp", version = "20240116.2") |
4 | | -bazel_dep(name = "aspect_bazel_lib", version = "2.9.4") |
5 | | -bazel_dep(name = "aspect_rules_js", version = "2.1.3") |
6 | | -bazel_dep(name = "bazel_remote_apis", version = "0") |
| 4 | +bazel_dep(name = "aspect_bazel_lib", version = "2.20.0") |
| 5 | +bazel_dep(name = "aspect_rules_js", version = "2.3.8") |
| 6 | +bazel_dep(name = "bazel_remote_apis", version = "0.0.0") |
7 | 7 | bazel_dep(name = "com_github_buildbarn_bb_browser") |
8 | 8 | bazel_dep(name = "com_github_buildbarn_bb_remote_execution") |
9 | 9 | bazel_dep(name = "com_github_buildbarn_bb_storage") |
10 | 10 | bazel_dep(name = "com_github_buildbarn_go_xdr") |
11 | | -bazel_dep(name = "gazelle", version = "0.42.0") |
12 | | -bazel_dep(name = "googleapis", version = "0.0.0-20240819-fe8ba054a") |
| 11 | +bazel_dep(name = "gazelle", version = "0.44.0") |
| 12 | + |
| 13 | +# bazel_dep(name = "googleapis", version = "0.0.0-20250703-f9d6fe4a") # bb-remote-execution |
| 14 | +bazel_dep(name = "googleapis", version = "0.0.0-20250604-de157ca3") |
13 | 15 | bazel_dep(name = "googletest", version = "1.15.2") |
14 | | -bazel_dep(name = "jsonnet_go", version = "0.20.0") |
15 | | -bazel_dep(name = "opentelemetry-proto", version = "1.5.0") |
| 16 | +bazel_dep(name = "jsonnet_go", version = "0.21.0") |
| 17 | +bazel_dep(name = "opentelemetry-proto", version = "1.7.0") |
16 | 18 | bazel_dep(name = "platforms", version = "0.0.11") |
17 | | -bazel_dep(name = "protobuf", version = "29.3") |
| 19 | +bazel_dep(name = "toolchains_protoc", version = "0.4.3") # must come BEFORE protobuf so the toolchain registration wins |
| 20 | +bazel_dep(name = "protobuf", version = "31.1") |
18 | 21 | bazel_dep(name = "remote_config_cc") |
19 | 22 | bazel_dep(name = "remote_config_sh") |
20 | 23 | bazel_dep(name = "rules_antlr") |
21 | 24 | bazel_dep(name = "rules_cc", version = "0.0.17") |
22 | | -bazel_dep(name = "rules_go", version = "0.53.0") |
23 | | -bazel_dep(name = "rules_jsonnet", version = "0.6.0") |
24 | | -bazel_dep(name = "rules_oci", version = "2.2.2") |
25 | | -bazel_dep(name = "rules_pkg", version = "1.0.1") |
| 25 | +bazel_dep(name = "rules_go", version = "0.55.1") |
| 26 | +bazel_dep(name = "rules_jsonnet", version = "0.7.2") |
| 27 | +bazel_dep(name = "rules_oci", version = "2.2.6") |
| 28 | +bazel_dep(name = "rules_pkg", version = "1.1.0") |
26 | 29 | bazel_dep(name = "rules_shell", version = "0.3.0") |
27 | | - |
28 | | -# TODO.... NB 2024-11-18: rules_proto is 7.0.2 in bb-storage, |
29 | | -# but held back to be compatible with bb-remote-execution. |
30 | 30 | bazel_dep(name = "rules_proto", version = "7.1.0") |
31 | | -bazel_dep(name = "toolchains_llvm", version = "1.3.0") |
32 | | -bazel_dep(name = "toolchains_protoc", version = "0.3.4") |
| 31 | +bazel_dep(name = "toolchains_llvm", version = "1.4.0") |
33 | 32 |
|
34 | 33 | # # Workarounds 2024-06-27 |
35 | 34 | # ERROR: in tag at https://bcr.bazel.build/modules/grpc-java/1.62.2/MODULE.bazel:89:15: no repository visible as '@com_google_protobuf_javalite' to the repository '@@grpc-java~', but referenced by label '@com_google_protobuf_javalite//:protobuf_javalite' in attribute 'target' of tag 'override'. Is the module 'grpc-java' missing a bazel_dep or use_repo(..., "com_google_protobuf_javalite")? |
@@ -104,26 +103,26 @@ local_path_override( |
104 | 103 |
|
105 | 104 | git_override( |
106 | 105 | module_name = "bazel_remote_apis", |
107 | | - commit = "7f922028fcfac63bdd8431e68de152d9e7a9e2a0", # bb-storage |
108 | | - # commit = "a6328f5026d3b2ae27bd8efd86a0f1057ccab361", # bb-remote-execution |
| 106 | + commit = "9ef19c6b5fbf77d6dd9d84d75fbb5a20a6b62ef1", # bb-storage |
| 107 | + # commit = "e94a7ece2a1e8da1dcf278a0baf2edfe7baafb94", # bb-remote-execution |
109 | 108 | remote = "https://github.com/bazelbuild/remote-apis.git", |
110 | 109 | ) |
111 | 110 |
|
112 | 111 | git_override( |
113 | 112 | module_name = "com_github_buildbarn_bb_browser", |
114 | | - commit = "9b44996f7d6a04185f61e7752cbe8649aaa59f16", |
| 113 | + commit = "5d2ed98e07561fdad8b50d995e9b1a76d4a96450", |
115 | 114 | remote = "https://github.com/buildbarn/bb-browser.git", |
116 | 115 | ) |
117 | 116 |
|
118 | 117 | git_override( |
119 | 118 | module_name = "com_github_buildbarn_bb_remote_execution", |
120 | | - commit = "1c726bdc27e7793c685d8788913f8f91f59bc887", |
| 119 | + commit = "135832aa47c42781f2af698a4823beda0863bad3", |
121 | 120 | remote = "https://github.com/buildbarn/bb-remote-execution.git", |
122 | 121 | ) |
123 | 122 |
|
124 | 123 | git_override( |
125 | 124 | module_name = "com_github_buildbarn_bb_storage", |
126 | | - commit = "1d733a37487a01416bda38eff6f61eb78103c7f0", |
| 125 | + commit = "fd11d3e1b0b435165c5e37254ac5d265e7999cb8", |
127 | 126 | remote = "https://github.com/buildbarn/bb-storage.git", |
128 | 127 | ) |
129 | 128 |
|
@@ -153,8 +152,12 @@ single_version_override( |
153 | 152 | patches = ["//:patches/jsonnet/bazel-8.diff"], |
154 | 153 | ) |
155 | 154 |
|
| 155 | +# Match protobuf above, until it ships a pre-built binary toolchain itself |
| 156 | +protoc = use_extension("@toolchains_protoc//protoc:extensions.bzl", "protoc") |
| 157 | +protoc.toolchain(version = "v31.1") |
| 158 | + |
156 | 159 | go_sdk = use_extension("@rules_go//go:extensions.bzl", "go_sdk") |
157 | | -go_sdk.download(version = "1.24.0") |
| 160 | +go_sdk.download(version = "1.24.5") |
158 | 161 |
|
159 | 162 | go_deps = use_extension("@gazelle//:extensions.bzl", "go_deps") |
160 | 163 | go_deps.from_file(go_mod = "//:go.mod") |
|
0 commit comments