Skip to content

Commit 1e3b782

Browse files
authored
Upgrade Buildbarn components 2024-10-24 (#148)
1 parent 34f1b89 commit 1e3b782

17 files changed

+27086
-2497
lines changed

.github/workflows/master.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
},
3838
{
3939
"name": "Gofmt",
40-
"run": "bazel run @cc_mvdan_gofumpt//:gofumpt -- -lang 1.19 -w -extra $(pwd)"
40+
"run": "bazel run @cc_mvdan_gofumpt//:gofumpt -- -w -extra $(pwd)"
4141
},
4242
{
4343
"name": "GitHub workflows",

.github/workflows/pull-requests.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
},
3838
{
3939
"name": "Gofmt",
40-
"run": "bazel run @cc_mvdan_gofumpt//:gofumpt -- -lang 1.19 -w -extra $(pwd)"
40+
"run": "bazel run @cc_mvdan_gofumpt//:gofumpt -- -w -extra $(pwd)"
4141
},
4242
{
4343
"name": "GitHub workflows",

MODULE.bazel

+25-17
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,28 @@
11
module(name = "com_github_buildbarn_bb_deployments")
22

33
bazel_dep(name = "abseil-cpp", version = "20240116.2")
4-
bazel_dep(name = "aspect_bazel_lib", version = "2.7.8")
5-
bazel_dep(name = "aspect_rules_js", version = "1.42.3")
4+
bazel_dep(name = "aspect_bazel_lib", version = "2.8.1")
5+
bazel_dep(name = "aspect_rules_js", version = "2.0.1")
6+
bazel_dep(name = "bazel_remote_apis", version = "0.0.0")
67
bazel_dep(name = "com_github_buildbarn_bb_browser")
78
bazel_dep(name = "com_github_buildbarn_bb_remote_execution")
89
bazel_dep(name = "com_github_buildbarn_bb_storage")
910
bazel_dep(name = "com_github_buildbarn_go_xdr")
10-
bazel_dep(name = "gazelle", version = "0.37.0")
11+
bazel_dep(name = "gazelle", version = "0.38.0")
1112
bazel_dep(name = "googleapis", version = "0.0.0-20240326-1c8d509c5")
1213
bazel_dep(name = "googletest", version = "1.14.0.bcr.1")
1314
bazel_dep(name = "jsonnet_go", version = "0.20.0")
14-
bazel_dep(name = "opentelemetry-proto", version = "1.3.1")
15-
bazel_dep(name = "protobuf", version = "27.1")
15+
bazel_dep(name = "opentelemetry-proto", version = "1.3.2")
16+
bazel_dep(name = "protobuf", version = "27.3")
1617
bazel_dep(name = "remote_config_cc")
1718
bazel_dep(name = "rules_antlr")
1819
bazel_dep(name = "rules_cc", version = "0.0.9")
19-
bazel_dep(name = "rules_go", version = "0.48.1")
20+
bazel_dep(name = "rules_go", version = "0.50.0")
2021
bazel_dep(name = "rules_jsonnet", version = "0.6.0")
21-
bazel_dep(name = "rules_oci", version = "1.7.6")
22-
bazel_dep(name = "rules_pkg", version = "0.10.1")
22+
bazel_dep(name = "rules_oci", version = "1.8.0")
23+
bazel_dep(name = "rules_pkg", version = "1.0.1")
2324
bazel_dep(name = "rules_proto", version = "6.0.2")
24-
bazel_dep(name = "toolchains_llvm", version = "1.0.0")
25+
bazel_dep(name = "toolchains_llvm", version = "1.1.2")
2526
bazel_dep(name = "toolchains_protoc", version = "0.3.1")
2627

2728
# # Workarounds 2026-06-27
@@ -72,21 +73,28 @@ local_path_override(
7273
path = "tools/remote-toolchains/ubuntu-act-22-04/local_config_cc",
7374
)
7475

76+
git_override(
77+
module_name = "bazel_remote_apis",
78+
# commit = "de1d77b12feb81f96909f0410991c3c966d9d8e7", # bb-storage
79+
commit = "a6328f5026d3b2ae27bd8efd86a0f1057ccab361", # bb-remote-execution
80+
remote = "https://github.com/bazelbuild/remote-apis.git",
81+
)
82+
7583
git_override(
7684
module_name = "com_github_buildbarn_bb_browser",
77-
commit = "f0fbe96530b0ea1e021ebf7230654fea8f049252",
85+
commit = "af89e4bc66f01ec022f8473a0068b8b6866662e2",
7886
remote = "https://github.com/buildbarn/bb-browser.git",
7987
)
8088

8189
git_override(
8290
module_name = "com_github_buildbarn_bb_remote_execution",
83-
commit = "9850e82ad7d875aa2ab183a5a08d79725c10fa16",
91+
commit = "2c788ba32d1e2d5416002db8a361556eb02de469",
8492
remote = "https://github.com/buildbarn/bb-remote-execution.git",
8593
)
8694

8795
git_override(
8896
module_name = "com_github_buildbarn_bb_storage",
89-
commit = "3f5e30c53d7b52036eb758a63bc98e706f5d4d5c",
97+
commit = "0941111f29e31905e4081e6262bccf0c123940ed",
9098
remote = "https://github.com/buildbarn/bb-storage.git",
9199
)
92100

@@ -109,15 +117,11 @@ git_override(
109117
git_override(
110118
module_name = "gazelle",
111119
commit = "4d0129d7adae33e8e648d3624aff8fa8f93f375b",
112-
patches = [
113-
"//:patches/gazelle/dont-flatten-srcs.diff",
114-
"//:patches/gazelle/googleapis.diff",
115-
],
116120
remote = "https://github.com/bazelbuild/bazel-gazelle.git",
117121
)
118122

119123
go_sdk = use_extension("@rules_go//go:extensions.bzl", "go_sdk")
120-
go_sdk.download(version = "1.22.4")
124+
go_sdk.download(version = "1.23.0")
121125

122126
go_deps = use_extension("@gazelle//:extensions.bzl", "go_deps")
123127
go_deps.from_file(go_mod = "//:go.mod")
@@ -150,6 +154,10 @@ go_deps_dev.module_override(
150154
patches = ["@com_github_buildbarn_bb_storage//:patches/org_golang_google_genproto_googleapis_bytestream/service-registrar.diff"],
151155
path = "google.golang.org/genproto/googleapis/bytestream",
152156
)
157+
go_deps_dev.module_override(
158+
patches = ["@com_github_buildbarn_bb_storage//:patches/org_golang_x_lint/generic.diff"],
159+
path = "golang.org/x/lint",
160+
)
153161
go_deps_dev.module_override(
154162
patches = [
155163
"@com_github_buildbarn_bb_remote_execution//:patches/com_github_hanwen_go_fuse_v2/direntrylist-offsets-and-testability.diff",

0 commit comments

Comments
 (0)