Skip to content

Commit eae07e9

Browse files
authored
Upgrade Buildbarn components 2024-12-18 (#158)
1 parent 6695072 commit eae07e9

File tree

13 files changed

+148
-15195
lines changed

13 files changed

+148
-15195
lines changed

MODULE.bazel

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@ 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.0")
6-
bazel_dep(name = "bazel_remote_apis", version = "0")
5+
bazel_dep(name = "aspect_rules_js", version = "2.1.2")
6+
bazel_dep(name = "bazel_remote_apis", version = "0.0.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")
1111
bazel_dep(name = "gazelle", version = "0.40.0")
1212
bazel_dep(name = "googleapis", version = "0.0.0-20240819-fe8ba054a")
13-
bazel_dep(name = "googletest", version = "1.14.0.bcr.1")
13+
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.3.2")
16-
bazel_dep(name = "protobuf", version = "28.3")
15+
bazel_dep(name = "opentelemetry-proto", version = "1.4.0")
16+
bazel_dep(name = "protobuf", version = "29.1")
1717
bazel_dep(name = "remote_config_cc")
1818
bazel_dep(name = "rules_antlr")
19-
bazel_dep(name = "rules_cc", version = "0.0.9")
19+
bazel_dep(name = "rules_cc", version = "0.0.17")
2020
bazel_dep(name = "rules_go", version = "0.50.1")
2121
bazel_dep(name = "rules_jsonnet", version = "0.6.0")
2222
bazel_dep(name = "rules_oci", version = "2.0.1")
@@ -90,13 +90,13 @@ git_override(
9090

9191
git_override(
9292
module_name = "com_github_buildbarn_bb_remote_execution",
93-
commit = "8a43a7749390a8253a1cf17bae37cc2fe8617dad",
93+
commit = "d03d5e3708ed851f7ec73a92e8ba155a97d88793",
9494
remote = "https://github.com/buildbarn/bb-remote-execution.git",
9595
)
9696

9797
git_override(
9898
module_name = "com_github_buildbarn_bb_storage",
99-
commit = "9cc3bc2af044eab9a9e11c9f461b0c1e7fc992f2",
99+
commit = "078d9d76e0f03cf20480f5e9afa76484f2701a30",
100100
remote = "https://github.com/buildbarn/bb-storage.git",
101101
)
102102

@@ -160,6 +160,10 @@ go_deps_dev.module_override(
160160
patches = ["@com_github_buildbarn_bb_storage//:patches/org_golang_x_lint/generic.diff"],
161161
path = "golang.org/x/lint",
162162
)
163+
go_deps_dev.module_override(
164+
patches = ["//:patches/org_golang_x_sys/o-search.diff"],
165+
path = "golang.org/x/sys",
166+
)
163167
go_deps_dev.module_override(
164168
patches = [
165169
"@com_github_buildbarn_bb_remote_execution//:patches/com_github_hanwen_go_fuse_v2/direntrylist-offsets-and-testability.diff",
@@ -176,7 +180,7 @@ go_deps_dev.gazelle_override(
176180
path = "github.com/cncf/xds/go",
177181
)
178182

179-
cc_configure = use_extension("@bazel_tools//tools/cpp:cc_configure.bzl", "cc_configure_extension")
183+
cc_configure = use_extension("@rules_cc//cc:extensions.bzl", "cc_configure_extension")
180184
use_repo(cc_configure, "local_config_cc_toolchains")
181185

182186
register_toolchains("@local_config_cc_toolchains//:all")

MODULE.bazel.lock

Lines changed: 58 additions & 15061 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ at the top right in the GitHub Actions page.
3535
| Repository | Container images and binaries |
3636
| ---------- | ----------------------------- |
3737
| [bb-browser](https://github.com/buildbarn/bb-browser) [`af89e4bc66`](https://github.com/buildbarn/bb-browser/commits/af89e4bc66f01ec022f8473a0068b8b6866662e2)<br/>2023-09-17 04:20:39 UTC | [ghcr.io/buildbarn/bb-browser:20240930T111151Z-af89e4b](https://ghcr.io/buildbarn/bb-browser:20240930T111151Z-af89e4b)<br/>[CI artifacts](https://github.com/buildbarn/bb-browser/actions/runs/11104924905) |
38-
| [bb-remote-execution](https://github.com/buildbarn/bb-remote-execution) [`8a43a77493`](https://github.com/buildbarn/bb-remote-execution/commits/8a43a7749390a8253a1cf17bae37cc2fe8617dad)<br/>2023-10-04 10:23:25 UTC | [ghcr.io/buildbarn/bb-runner-installer:20241030T155505Z-8a43a77](https://ghcr.io/buildbarn/bb-runner-installer:20241030T155505Z-8a43a77)<br/>[ghcr.io/buildbarn/bb-scheduler:20241030T155505Z-8a43a77](https://ghcr.io/buildbarn/bb-scheduler:20241030T155505Z-8a43a77)<br/>[ghcr.io/buildbarn/bb-worker:20241030T155505Z-8a43a77](https://ghcr.io/buildbarn/bb-worker:20241030T155505Z-8a43a77)<br/>[CI artifacts](https://github.com/buildbarn/bb-remote-execution/actions/runs/11596945646) |
39-
| [bb-storage](https://github.com/buildbarn/bb-storage) [`9cc3bc2af0`](https://github.com/buildbarn/bb-storage/commits/9cc3bc2af044eab9a9e11c9f461b0c1e7fc992f2)<br/>2023-10-08 11:11:12 UTC | [ghcr.io/buildbarn/bb-storage:20241117T113434Z-9cc3bc2](https://ghcr.io/buildbarn/bb-storage:20241117T113434Z-9cc3bc2)<br/>[CI artifacts](https://github.com/buildbarn/bb-storage/actions/runs/11878499223) |
38+
| [bb-remote-execution](https://github.com/buildbarn/bb-remote-execution) [`d03d5e3708`](https://github.com/buildbarn/bb-remote-execution/commits/d03d5e3708ed851f7ec73a92e8ba155a97d88793)<br/>2023-10-04 10:23:25 UTC | [ghcr.io/buildbarn/bb-runner-installer:20241215T094620Z-d03d5e3](https://ghcr.io/buildbarn/bb-runner-installer:20241215T094620Z-d03d5e3)<br/>[ghcr.io/buildbarn/bb-scheduler:20241215T094620Z-d03d5e3](https://ghcr.io/buildbarn/bb-scheduler:20241215T094620Z-d03d5e3)<br/>[ghcr.io/buildbarn/bb-worker:20241215T094620Z-d03d5e3](https://ghcr.io/buildbarn/bb-worker:20241215T094620Z-d03d5e3)<br/>[CI artifacts](https://github.com/buildbarn/bb-remote-execution/actions/runs/12337754540) |
39+
| [bb-storage](https://github.com/buildbarn/bb-storage) [`078d9d76e0`](https://github.com/buildbarn/bb-storage/commits/078d9d76e0f03cf20480f5e9afa76484f2701a30)<br/>2023-10-08 11:11:12 UTC | [ghcr.io/buildbarn/bb-storage:20241212T082716Z-078d9d7](https://ghcr.io/buildbarn/bb-storage:20241212T082716Z-078d9d7)<br/>[CI artifacts](https://github.com/buildbarn/bb-storage/actions/runs/12292535405) |
4040

4141
## Changelog
4242

changelog.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# 2024-12-18
2+
3+
* Change FUSE mount to not fallback to 'fusermount'
4+
https://github.com/buildbarn/bb-remote-execution/commit/d03d5e3708ed851f7ec73a92e8ba155a97d88793
5+
16
# 2024-11-12
27

38
* Double the number of KeyLocationMap attempts

docker-compose/config/worker-fuse-ubuntu22-04.jsonnet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ local common = import 'common.libsonnet';
6060
directoryEntryValidity: '300s',
6161
inodeAttributeValidity: '300s',
6262
allowOther: true,
63-
directMount: true,
63+
mountMethod: 'DIRECT',
6464
},
6565
},
6666
},

docker-compose/docker-compose.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: '3'
22
services:
33
frontend:
4-
image: ghcr.io/buildbarn/bb-storage:20241117T113434Z-9cc3bc2
4+
image: ghcr.io/buildbarn/bb-storage:20241212T082716Z-078d9d7
55
command:
66
- /config/frontend.jsonnet
77
expose:
@@ -12,7 +12,7 @@ services:
1212
- ./config:/config
1313

1414
storage-0:
15-
image: ghcr.io/buildbarn/bb-storage:20241117T113434Z-9cc3bc2
15+
image: ghcr.io/buildbarn/bb-storage:20241212T082716Z-078d9d7
1616
command:
1717
- /config/storage.jsonnet
1818
expose:
@@ -24,7 +24,7 @@ services:
2424
- ./volumes/storage-cas-0:/storage-cas
2525

2626
storage-1:
27-
image: ghcr.io/buildbarn/bb-storage:20241117T113434Z-9cc3bc2
27+
image: ghcr.io/buildbarn/bb-storage:20241212T082716Z-078d9d7
2828
command:
2929
- /config/storage.jsonnet
3030
expose:
@@ -36,7 +36,7 @@ services:
3636
- ./volumes/storage-cas-1:/storage-cas
3737

3838
scheduler:
39-
image: ghcr.io/buildbarn/bb-scheduler:20241030T155505Z-8a43a77
39+
image: ghcr.io/buildbarn/bb-scheduler:20241215T094620Z-d03d5e3
4040
command:
4141
- /config/scheduler.jsonnet
4242
expose:
@@ -63,13 +63,13 @@ services:
6363
- ./config:/config
6464

6565
runner-installer:
66-
image: ghcr.io/buildbarn/bb-runner-installer:20241030T155505Z-8a43a77
66+
image: ghcr.io/buildbarn/bb-runner-installer:20241215T094620Z-d03d5e3
6767
volumes:
6868
- ./volumes/bb:/bb
6969

7070
# The FUSE worker is the most efficient configuration.
7171
worker-fuse-ubuntu22-04:
72-
image: ghcr.io/buildbarn/bb-worker:20241030T155505Z-8a43a77
72+
image: ghcr.io/buildbarn/bb-worker:20241215T094620Z-d03d5e3
7373
command:
7474
- /config/worker-fuse-ubuntu22-04.jsonnet
7575
# Need to be privileged for the FUSE mounting to work.
@@ -105,7 +105,7 @@ services:
105105
# For situations where the more efficient FUSE worker is not supported,
106106
# the classic hardlinking example is shown here.
107107
worker-hardlinking-ubuntu22-04:
108-
image: ghcr.io/buildbarn/bb-worker:20241030T155505Z-8a43a77
108+
image: ghcr.io/buildbarn/bb-worker:20241215T094620Z-d03d5e3
109109
command:
110110
- /config/worker-hardlinking-ubuntu22-04.jsonnet
111111
privileged: false

go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ go 1.23.0
55
// https://github.com/grpc-ecosystem/grpc-gateway/commit/5f9757f31b517d98095209636b2b88cd6326572f
66
// replace github.com/grpc-ecosystem/grpc-gateway/v2 => github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.1
77

8-
// Gazelle does not like newer versions.
9-
replace golang.org/x/tools => golang.org/x/tools v0.8.0
8+
// https://github.com/bazel-contrib/rules_go/issues/4170
9+
replace golang.org/x/tools => golang.org/x/tools v0.26.0
1010

1111
// Using the most recent version causes a cyclic dependency in protoc.
1212
replace google.golang.org/protobuf => google.golang.org/protobuf v1.32.0
@@ -24,8 +24,8 @@ replace cloud.google.com/go/storage v1.45.0 => cloud.google.com/go/storage v1.43
2424
require (
2525
github.com/bazelbuild/rules_go v0.49.0
2626
github.com/buildbarn/bb-browser v0.0.0-20240930111151-af89e4bc66f0
27-
github.com/buildbarn/bb-remote-execution v0.0.0-20241030155505-8a43a7749390
28-
github.com/buildbarn/bb-storage v0.0.0-20241117113434-9cc3bc2af044
27+
github.com/buildbarn/bb-remote-execution v0.0.0-20241215094620-d03d5e3708ed
28+
github.com/buildbarn/bb-storage v0.0.0-20241212082716-078d9d76e0f0
2929
golang.org/x/lint v0.0.0-20241112194109-818c5a804067
3030
mvdan.cc/gofumpt v0.7.0
3131
)

0 commit comments

Comments
 (0)