-
Notifications
You must be signed in to change notification settings - Fork 69
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Upgrade Buildbarn components 2025-02-14
- Loading branch information
1 parent
eae07e9
commit 419f8ab
Showing
16 changed files
with
1,427 additions
and
10,045 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
7.2.0 | ||
8.0.1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,32 +2,35 @@ module(name = "com_github_buildbarn_bb_deployments") | |
|
||
bazel_dep(name = "abseil-cpp", version = "20240116.2") | ||
bazel_dep(name = "aspect_bazel_lib", version = "2.9.4") | ||
bazel_dep(name = "aspect_rules_js", version = "2.1.2") | ||
bazel_dep(name = "bazel_remote_apis", version = "0.0.0") | ||
bazel_dep(name = "aspect_rules_js", version = "2.1.3") | ||
bazel_dep(name = "bazel_remote_apis", version = "0") | ||
bazel_dep(name = "com_github_buildbarn_bb_browser") | ||
bazel_dep(name = "com_github_buildbarn_bb_remote_execution") | ||
bazel_dep(name = "com_github_buildbarn_bb_storage") | ||
bazel_dep(name = "com_github_buildbarn_go_xdr") | ||
bazel_dep(name = "gazelle", version = "0.40.0") | ||
bazel_dep(name = "gazelle", version = "0.42.0") | ||
bazel_dep(name = "googleapis", version = "0.0.0-20240819-fe8ba054a") | ||
bazel_dep(name = "googletest", version = "1.15.2") | ||
bazel_dep(name = "jsonnet_go", version = "0.20.0") | ||
bazel_dep(name = "opentelemetry-proto", version = "1.4.0") | ||
bazel_dep(name = "protobuf", version = "29.1") | ||
bazel_dep(name = "opentelemetry-proto", version = "1.5.0") | ||
bazel_dep(name = "platforms", version = "0.0.11") | ||
bazel_dep(name = "protobuf", version = "29.3") | ||
bazel_dep(name = "remote_config_cc") | ||
bazel_dep(name = "rules_antlr") | ||
bazel_dep(name = "rules_cc", version = "0.0.17") | ||
bazel_dep(name = "rules_go", version = "0.50.1") | ||
bazel_dep(name = "rules_go", version = "0.53.0") | ||
bazel_dep(name = "rules_jsonnet", version = "0.6.0") | ||
bazel_dep(name = "rules_oci", version = "2.0.1") | ||
bazel_dep(name = "rules_oci", version = "2.2.2") | ||
bazel_dep(name = "rules_pkg", version = "1.0.1") | ||
bazel_dep(name = "rules_shell", version = "0.3.0") | ||
|
||
# NB 2024-11-18: rules_proto is 7.0.2 in bb-storage, but held back to be compatible with bb-remote-execution. | ||
bazel_dep(name = "rules_proto", version = "6.0.2") | ||
bazel_dep(name = "toolchains_llvm", version = "1.2.0") | ||
# TODO.... NB 2024-11-18: rules_proto is 7.0.2 in bb-storage, | ||
# but held back to be compatible with bb-remote-execution. | ||
bazel_dep(name = "rules_proto", version = "7.1.0") | ||
bazel_dep(name = "toolchains_llvm", version = "1.3.0") | ||
bazel_dep(name = "toolchains_protoc", version = "0.3.4") | ||
|
||
# # Workarounds 2026-06-27 | ||
# # Workarounds 2024-06-27 | ||
# 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")? | ||
# https://github.com/grpc/grpc-java/issues/11275 | ||
# 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") | |
# │ ├───[email protected] (*) | ||
bazel_dep(name = "grpc-java", version = "1.64.0") | ||
|
||
# # Workaround 2025-01-19: For some reason rules_apple fails to build. | ||
# ERROR: Traceback (most recent call last): | ||
# File "/CAS/bazel-cache/f1a15cfb78ca8fde7615be5d21224669/external/rules_apple+/apple/internal/apple_xcframework_import.bzl", line 775, column 21, in <toplevel> | ||
# apple_common.AppleDynamicFramework, | ||
# Error: 'struct' value has no field or method 'AppleDynamicFramework' | ||
single_version_override( | ||
module_name = "rules_apple", | ||
version = "3.19.0", | ||
) | ||
|
||
bazel_dep(name = "buildifier_prebuilt", version = "6.4.0", dev_dependency = True) | ||
|
||
http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") | ||
|
@@ -77,26 +90,26 @@ local_path_override( | |
|
||
git_override( | ||
module_name = "bazel_remote_apis", | ||
commit = "253013303c9e1d52ebdeb5a3f0f869919e882f20", # bb-storage | ||
commit = "7f922028fcfac63bdd8431e68de152d9e7a9e2a0", # bb-storage | ||
# commit = "a6328f5026d3b2ae27bd8efd86a0f1057ccab361", # bb-remote-execution | ||
remote = "https://github.com/bazelbuild/remote-apis.git", | ||
) | ||
|
||
git_override( | ||
module_name = "com_github_buildbarn_bb_browser", | ||
commit = "af89e4bc66f01ec022f8473a0068b8b6866662e2", | ||
commit = "9c1714be8cf55061c698b2e629e13496071e23a1", | ||
remote = "https://github.com/buildbarn/bb-browser.git", | ||
) | ||
|
||
git_override( | ||
module_name = "com_github_buildbarn_bb_remote_execution", | ||
commit = "d03d5e3708ed851f7ec73a92e8ba155a97d88793", | ||
commit = "31d23d1a2b0cf4c6785bc96e3576e439063d6b7c", | ||
remote = "https://github.com/buildbarn/bb-remote-execution.git", | ||
) | ||
|
||
git_override( | ||
module_name = "com_github_buildbarn_bb_storage", | ||
commit = "078d9d76e0f03cf20480f5e9afa76484f2701a30", | ||
commit = "2600f229e4b68a92591109827f78b047a7fe4d01", | ||
remote = "https://github.com/buildbarn/bb-storage.git", | ||
) | ||
|
||
|
@@ -116,14 +129,18 @@ git_override( | |
remote = "https://github.com/marcohu/rules_antlr.git", | ||
) | ||
|
||
git_override( | ||
single_version_override( | ||
module_name = "gazelle", | ||
commit = "4d0129d7adae33e8e648d3624aff8fa8f93f375b", | ||
remote = "https://github.com/bazelbuild/bazel-gazelle.git", | ||
patches = ["//:patches/gazelle/dont-flatten-srcs.diff"], | ||
) | ||
|
||
single_version_override( | ||
module_name = "jsonnet", | ||
patches = ["//:patches/jsonnet/bazel-8.diff"], | ||
) | ||
|
||
go_sdk = use_extension("@rules_go//go:extensions.bzl", "go_sdk") | ||
go_sdk.download(version = "1.23.3") | ||
go_sdk.download(version = "1.24.0") | ||
|
||
go_deps = use_extension("@gazelle//:extensions.bzl", "go_deps") | ||
go_deps.from_file(go_mod = "//:go.mod") | ||
|
@@ -134,6 +151,13 @@ use_repo( | |
) | ||
|
||
go_deps_dev = use_extension("@gazelle//:extensions.bzl", "go_deps", dev_dependency = True) | ||
|
||
# NB 2024-11-18: Solve issues with BUILD file paths in xds. | ||
# https://github.com/cncf/xds/issues/104 | ||
go_deps_dev.gazelle_override( | ||
build_file_generation = "on", | ||
path = "github.com/cncf/xds/go", | ||
) | ||
go_deps_dev.module_override( | ||
patches = ["@com_github_buildbarn_bb_browser//:patches/com_github_buildkite_terminal_to_html/assets.diff"], | ||
path = "github.com/buildkite/terminal-to-html", | ||
|
@@ -173,13 +197,6 @@ go_deps_dev.module_override( | |
path = "github.com/hanwen/go-fuse/v2", | ||
) | ||
|
||
# NB 2024-11-18: Solve issues with BUILD file paths in xds. | ||
# https://github.com/cncf/xds/issues/104 | ||
go_deps_dev.gazelle_override( | ||
build_file_generation = "on", | ||
path = "github.com/cncf/xds/go", | ||
) | ||
|
||
cc_configure = use_extension("@rules_cc//cc:extensions.bzl", "cc_configure_extension") | ||
use_repo(cc_configure, "local_config_cc_toolchains") | ||
|
||
|
Oops, something went wrong.