Skip to content

Commit 8fa00d4

Browse files
committed
Upgrade Buildbarn components 2025-02-14
1 parent eae07e9 commit 8fa00d4

File tree

15 files changed

+1423
-10044
lines changed

15 files changed

+1423
-10044
lines changed

.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.2.0
1+
8.0.1

MODULE.bazel

Lines changed: 43 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,35 @@ module(name = "com_github_buildbarn_bb_deployments")
22

33
bazel_dep(name = "abseil-cpp", version = "20240116.2")
44
bazel_dep(name = "aspect_bazel_lib", version = "2.9.4")
5-
bazel_dep(name = "aspect_rules_js", version = "2.1.2")
6-
bazel_dep(name = "bazel_remote_apis", version = "0.0.0")
5+
bazel_dep(name = "aspect_rules_js", version = "2.1.3")
6+
bazel_dep(name = "bazel_remote_apis", version = "0")
77
bazel_dep(name = "com_github_buildbarn_bb_browser")
88
bazel_dep(name = "com_github_buildbarn_bb_remote_execution")
99
bazel_dep(name = "com_github_buildbarn_bb_storage")
1010
bazel_dep(name = "com_github_buildbarn_go_xdr")
11-
bazel_dep(name = "gazelle", version = "0.40.0")
11+
bazel_dep(name = "gazelle", version = "0.42.0")
1212
bazel_dep(name = "googleapis", version = "0.0.0-20240819-fe8ba054a")
1313
bazel_dep(name = "googletest", version = "1.15.2")
1414
bazel_dep(name = "jsonnet_go", version = "0.20.0")
15-
bazel_dep(name = "opentelemetry-proto", version = "1.4.0")
16-
bazel_dep(name = "protobuf", version = "29.1")
15+
bazel_dep(name = "opentelemetry-proto", version = "1.5.0")
16+
bazel_dep(name = "platforms", version = "0.0.11")
17+
bazel_dep(name = "protobuf", version = "29.3")
1718
bazel_dep(name = "remote_config_cc")
1819
bazel_dep(name = "rules_antlr")
1920
bazel_dep(name = "rules_cc", version = "0.0.17")
20-
bazel_dep(name = "rules_go", version = "0.50.1")
21+
bazel_dep(name = "rules_go", version = "0.53.0")
2122
bazel_dep(name = "rules_jsonnet", version = "0.6.0")
22-
bazel_dep(name = "rules_oci", version = "2.0.1")
23+
bazel_dep(name = "rules_oci", version = "2.2.2")
2324
bazel_dep(name = "rules_pkg", version = "1.0.1")
25+
bazel_dep(name = "rules_shell", version = "0.3.0")
2426

25-
# NB 2024-11-18: rules_proto is 7.0.2 in bb-storage, but held back to be compatible with bb-remote-execution.
26-
bazel_dep(name = "rules_proto", version = "6.0.2")
27-
bazel_dep(name = "toolchains_llvm", version = "1.2.0")
27+
# TODO.... NB 2024-11-18: rules_proto is 7.0.2 in bb-storage,
28+
# but held back to be compatible with bb-remote-execution.
29+
bazel_dep(name = "rules_proto", version = "7.1.0")
30+
bazel_dep(name = "toolchains_llvm", version = "1.3.0")
2831
bazel_dep(name = "toolchains_protoc", version = "0.3.4")
2932

30-
# # Workarounds 2026-06-27
33+
# # Workarounds 2024-06-27
3134
# 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")?
3235
# https://github.com/grpc/grpc-java/issues/11275
3336
# This can be removed once the dep that introduces `grpc-java` as a transitive
@@ -36,6 +39,16 @@ bazel_dep(name = "toolchains_protoc", version = "0.3.4")
3639
# │ ├───grpc-java@1.64.0 (*)
3740
bazel_dep(name = "grpc-java", version = "1.64.0")
3841

42+
# # Workaround 2025-01-19: For some reason rules_apple fails to build.
43+
# ERROR: Traceback (most recent call last):
44+
# File "/CAS/bazel-cache/f1a15cfb78ca8fde7615be5d21224669/external/rules_apple+/apple/internal/apple_xcframework_import.bzl", line 775, column 21, in <toplevel>
45+
# apple_common.AppleDynamicFramework,
46+
# Error: 'struct' value has no field or method 'AppleDynamicFramework'
47+
single_version_override(
48+
module_name = "rules_apple",
49+
version = "3.19.0",
50+
)
51+
3952
bazel_dep(name = "buildifier_prebuilt", version = "6.4.0", dev_dependency = True)
4053

4154
http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
@@ -77,26 +90,26 @@ local_path_override(
7790

7891
git_override(
7992
module_name = "bazel_remote_apis",
80-
commit = "253013303c9e1d52ebdeb5a3f0f869919e882f20", # bb-storage
93+
commit = "7f922028fcfac63bdd8431e68de152d9e7a9e2a0", # bb-storage
8194
# commit = "a6328f5026d3b2ae27bd8efd86a0f1057ccab361", # bb-remote-execution
8295
remote = "https://github.com/bazelbuild/remote-apis.git",
8396
)
8497

8598
git_override(
8699
module_name = "com_github_buildbarn_bb_browser",
87-
commit = "af89e4bc66f01ec022f8473a0068b8b6866662e2",
100+
commit = "9c1714be8cf55061c698b2e629e13496071e23a1",
88101
remote = "https://github.com/buildbarn/bb-browser.git",
89102
)
90103

91104
git_override(
92105
module_name = "com_github_buildbarn_bb_remote_execution",
93-
commit = "d03d5e3708ed851f7ec73a92e8ba155a97d88793",
106+
commit = "31d23d1a2b0cf4c6785bc96e3576e439063d6b7c",
94107
remote = "https://github.com/buildbarn/bb-remote-execution.git",
95108
)
96109

97110
git_override(
98111
module_name = "com_github_buildbarn_bb_storage",
99-
commit = "078d9d76e0f03cf20480f5e9afa76484f2701a30",
112+
commit = "2600f229e4b68a92591109827f78b047a7fe4d01",
100113
remote = "https://github.com/buildbarn/bb-storage.git",
101114
)
102115

@@ -116,14 +129,18 @@ git_override(
116129
remote = "https://github.com/marcohu/rules_antlr.git",
117130
)
118131

119-
git_override(
132+
single_version_override(
120133
module_name = "gazelle",
121-
commit = "4d0129d7adae33e8e648d3624aff8fa8f93f375b",
122-
remote = "https://github.com/bazelbuild/bazel-gazelle.git",
134+
patches = ["//:patches/gazelle/dont-flatten-srcs.diff"],
135+
)
136+
137+
single_version_override(
138+
module_name = "jsonnet",
139+
patches = ["//:patches/jsonnet/bazel-8.diff"],
123140
)
124141

125142
go_sdk = use_extension("@rules_go//go:extensions.bzl", "go_sdk")
126-
go_sdk.download(version = "1.23.3")
143+
go_sdk.download(version = "1.24.0")
127144

128145
go_deps = use_extension("@gazelle//:extensions.bzl", "go_deps")
129146
go_deps.from_file(go_mod = "//:go.mod")
@@ -134,6 +151,13 @@ use_repo(
134151
)
135152

136153
go_deps_dev = use_extension("@gazelle//:extensions.bzl", "go_deps", dev_dependency = True)
154+
155+
# NB 2024-11-18: Solve issues with BUILD file paths in xds.
156+
# https://github.com/cncf/xds/issues/104
157+
go_deps_dev.gazelle_override(
158+
build_file_generation = "on",
159+
path = "github.com/cncf/xds/go",
160+
)
137161
go_deps_dev.module_override(
138162
patches = ["@com_github_buildbarn_bb_browser//:patches/com_github_buildkite_terminal_to_html/assets.diff"],
139163
path = "github.com/buildkite/terminal-to-html",
@@ -173,13 +197,6 @@ go_deps_dev.module_override(
173197
path = "github.com/hanwen/go-fuse/v2",
174198
)
175199

176-
# NB 2024-11-18: Solve issues with BUILD file paths in xds.
177-
# https://github.com/cncf/xds/issues/104
178-
go_deps_dev.gazelle_override(
179-
build_file_generation = "on",
180-
path = "github.com/cncf/xds/go",
181-
)
182-
183200
cc_configure = use_extension("@rules_cc//cc:extensions.bzl", "cc_configure_extension")
184201
use_repo(cc_configure, "local_config_cc_toolchains")
185202

0 commit comments

Comments
 (0)