Upgrade Buildbarn components 2024-10-24

buildbarn · Oct 24, 2024 · 5cfa6b6 · 5cfa6b6
1 parent 78a3a49
commit 5cfa6b6
Show file tree

Hide file tree

Showing 13 changed files with 19,628 additions and 2,487 deletions.
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -1,27 +1,28 @@
 module(name = "com_github_buildbarn_bb_deployments")
 
 bazel_dep(name = "abseil-cpp", version = "20240116.2")
-bazel_dep(name = "aspect_bazel_lib", version = "2.7.8")
-bazel_dep(name = "aspect_rules_js", version = "1.42.3")
+bazel_dep(name = "aspect_bazel_lib", version = "2.8.1")
+bazel_dep(name = "aspect_rules_js", version = "2.0.1")
+bazel_dep(name = "bazel_remote_apis", version = "0.0.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.37.0")
+bazel_dep(name = "gazelle", version = "0.38.0")
 bazel_dep(name = "googleapis", version = "0.0.0-20240326-1c8d509c5")
 bazel_dep(name = "googletest", version = "1.14.0.bcr.1")
 bazel_dep(name = "jsonnet_go", version = "0.20.0")
-bazel_dep(name = "opentelemetry-proto", version = "1.3.1")
-bazel_dep(name = "protobuf", version = "27.1")
+bazel_dep(name = "opentelemetry-proto", version = "1.3.2")
+bazel_dep(name = "protobuf", version = "27.3")
 bazel_dep(name = "remote_config_cc")
 bazel_dep(name = "rules_antlr")
 bazel_dep(name = "rules_cc", version = "0.0.9")
-bazel_dep(name = "rules_go", version = "0.48.1")
+bazel_dep(name = "rules_go", version = "0.50.0")
 bazel_dep(name = "rules_jsonnet", version = "0.6.0")
-bazel_dep(name = "rules_oci", version = "1.7.6")
-bazel_dep(name = "rules_pkg", version = "0.10.1")
+bazel_dep(name = "rules_oci", version = "1.8.0")
+bazel_dep(name = "rules_pkg", version = "1.0.1")
 bazel_dep(name = "rules_proto", version = "6.0.2")
-bazel_dep(name = "toolchains_llvm", version = "1.0.0")
+bazel_dep(name = "toolchains_llvm", version = "1.1.2")
 bazel_dep(name = "toolchains_protoc", version = "0.3.1")
 
 # # Workarounds 2026-06-27
@@ -72,21 +73,28 @@ local_path_override(
     path = "tools/remote-toolchains/ubuntu-act-22-04/local_config_cc",
 )
 
+git_override(
+    module_name = "bazel_remote_apis",
+    # commit = "de1d77b12feb81f96909f0410991c3c966d9d8e7",  # 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 = "f0fbe96530b0ea1e021ebf7230654fea8f049252",
+    commit = "af89e4bc66f01ec022f8473a0068b8b6866662e2",
     remote = "https://github.com/buildbarn/bb-browser.git",
 )
 
 git_override(
     module_name = "com_github_buildbarn_bb_remote_execution",
-    commit = "9850e82ad7d875aa2ab183a5a08d79725c10fa16",
+    commit = "2c788ba32d1e2d5416002db8a361556eb02de469",
     remote = "https://github.com/buildbarn/bb-remote-execution.git",
 )
 
 git_override(
     module_name = "com_github_buildbarn_bb_storage",
-    commit = "3f5e30c53d7b52036eb758a63bc98e706f5d4d5c",
+    commit = "0941111f29e31905e4081e6262bccf0c123940ed",
     remote = "https://github.com/buildbarn/bb-storage.git",
 )
 
@@ -109,15 +117,12 @@ git_override(
 git_override(
     module_name = "gazelle",
     commit = "4d0129d7adae33e8e648d3624aff8fa8f93f375b",
-    patches = [
-        "//:patches/gazelle/dont-flatten-srcs.diff",
-        "//:patches/gazelle/googleapis.diff",
-    ],
+    patches = ["//:patches/gazelle/dont-flatten-srcs.diff"],
     remote = "https://github.com/bazelbuild/bazel-gazelle.git",
 )
 
 go_sdk = use_extension("@rules_go//go:extensions.bzl", "go_sdk")
-go_sdk.download(version = "1.22.4")
+go_sdk.download(version = "1.23.0")
 
 go_deps = use_extension("@gazelle//:extensions.bzl", "go_deps")
 go_deps.from_file(go_mod = "//:go.mod")
@@ -150,6 +155,10 @@ go_deps_dev.module_override(
     patches = ["@com_github_buildbarn_bb_storage//:patches/org_golang_google_genproto_googleapis_bytestream/service-registrar.diff"],
     path = "google.golang.org/genproto/googleapis/bytestream",
 )
+go_deps_dev.module_override(
+    patches = ["@com_github_buildbarn_bb_storage//:patches/org_golang_x_lint/generic.diff"],
+    path = "golang.org/x/lint",
+)
 go_deps_dev.module_override(
     patches = [
         "@com_github_buildbarn_bb_remote_execution//:patches/com_github_hanwen_go_fuse_v2/direntrylist-offsets-and-testability.diff",

diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock
diff --git a/README.md b/README.md
@@ -34,9 +34,9 @@ at the top right in the GitHub Actions page.
 
 | Repository | Container images and binaries |
 | ---------- | ----------------------------- |
-| [bb-browser](https://github.com/buildbarn/bb-browser) [`f0fbe96530`](https://github.com/buildbarn/bb-browser/commits/f0fbe96530b0ea1e021ebf7230654fea8f049252)<br/>2023-09-17 04:20:39 UTC | [ghcr.io/buildbarn/bb-browser:20240613T055327Z-f0fbe96](https://ghcr.io/buildbarn/bb-browser:20240613T055327Z-f0fbe96)<br/>[CI artifacts](https://github.com/buildbarn/bb-browser/actions/runs/9494451616) |
-| [bb-remote-execution](https://github.com/buildbarn/bb-remote-execution) [`9850e82ad7`](https://github.com/buildbarn/bb-remote-execution/commits/9850e82ad7d875aa2ab183a5a08d79725c10fa16)<br/>2023-10-04 10:23:25 UTC | [ghcr.io/buildbarn/bb-runner-installer:20240716T044555Z-9850e82](https://ghcr.io/buildbarn/bb-runner-installer:20240716T044555Z-9850e82)<br/>[ghcr.io/buildbarn/bb-scheduler:20240716T044555Z-9850e82](https://ghcr.io/buildbarn/bb-scheduler:20240716T044555Z-9850e82)<br/>[ghcr.io/buildbarn/bb-worker:20240716T044555Z-9850e82](https://ghcr.io/buildbarn/bb-worker:20240716T044555Z-9850e82)<br/>[CI artifacts](https://github.com/buildbarn/bb-remote-execution/actions/runs/9950897722) |
-| [bb-storage](https://github.com/buildbarn/bb-storage) [`3f5e30c53d`](https://github.com/buildbarn/bb-storage/commits/3f5e30c53d7b52036eb758a63bc98e706f5d4d5c)<br/>2023-10-08 11:11:12 UTC | [ghcr.io/buildbarn/bb-storage:20240810T092106Z-3f5e30c](https://ghcr.io/buildbarn/bb-storage:20240810T092106Z-3f5e30c)<br/>[CI artifacts](https://github.com/buildbarn/bb-storage/actions/runs/10330587475) |
+| [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) |
+| [bb-remote-execution](https://github.com/buildbarn/bb-remote-execution) [`2c788ba32d`](https://github.com/buildbarn/bb-remote-execution/commits/2c788ba32d1e2d5416002db8a361556eb02de469)<br/>2023-10-04 10:23:25 UTC | [ghcr.io/buildbarn/bb-runner-installer:20241010T174523Z-2c788ba](https://ghcr.io/buildbarn/bb-runner-installer:20241010T174523Z-2c788ba)<br/>[ghcr.io/buildbarn/bb-scheduler:20241010T174523Z-2c788ba](https://ghcr.io/buildbarn/bb-scheduler:20241010T174523Z-2c788ba)<br/>[ghcr.io/buildbarn/bb-worker:20241010T174523Z-2c788ba](https://ghcr.io/buildbarn/bb-worker:20241010T174523Z-2c788ba)<br/>[CI artifacts](https://github.com/buildbarn/bb-remote-execution/actions/runs/11279270098) |
+| [bb-storage](https://github.com/buildbarn/bb-storage) [`0941111f29`](https://github.com/buildbarn/bb-storage/commits/0941111f29e31905e4081e6262bccf0c123940ed)<br/>2023-10-08 11:11:12 UTC | [ghcr.io/buildbarn/bb-storage:20241007T042721Z-0941111](https://ghcr.io/buildbarn/bb-storage:20241007T042721Z-0941111)<br/>[CI artifacts](https://github.com/buildbarn/bb-storage/actions/runs/11208671455) |
 
 ## Changelog
 
@@ -221,7 +221,7 @@ sed '/^$/d' go_dependencies.bzl > go_dependencies.bzl.new
 mv go_dependencies.bzl.new go_dependencies.bzl
 bazel run //:buildifier.check
 # Gofmt
-bazel run @cc_mvdan_gofumpt//:gofumpt -- -lang 1.21 -w -extra $PWD
+bazel run @cc_mvdan_gofumpt//:gofumpt -- -w -extra $PWD
 # Golint
 bazel run @org_golang_x_lint//golint -- -set_exit_status $PWD/...
 ```
diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,8 @@
+# 2024-10-24
+
+* Use more dependencies through modules and avoid a few patches
+* Improved TLS Cert handling
+
 # 2024-08-14
 
 * Freshen up Windows Workers

diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3'
 services:
   frontend:
-    image: ghcr.io/buildbarn/bb-storage:20240810T092106Z-3f5e30c
+    image: ghcr.io/buildbarn/bb-storage:20241007T042721Z-0941111
     command:
     - /config/frontend.jsonnet
     expose:
@@ -12,7 +12,7 @@ services:
     - ./config:/config
 
   storage-0:
-    image: ghcr.io/buildbarn/bb-storage:20240810T092106Z-3f5e30c
+    image: ghcr.io/buildbarn/bb-storage:20241007T042721Z-0941111
     command:
     - /config/storage.jsonnet
     expose:
@@ -24,7 +24,7 @@ services:
     - ./volumes/storage-cas-0:/storage-cas
 
   storage-1:
-    image: ghcr.io/buildbarn/bb-storage:20240810T092106Z-3f5e30c
+    image: ghcr.io/buildbarn/bb-storage:20241007T042721Z-0941111
     command:
     - /config/storage.jsonnet
     expose:
@@ -36,7 +36,7 @@ services:
     - ./volumes/storage-cas-1:/storage-cas
 
   scheduler:
-    image: ghcr.io/buildbarn/bb-scheduler:20240716T044555Z-9850e82
+    image: ghcr.io/buildbarn/bb-scheduler:20241010T174523Z-2c788ba
     command:
     - /config/scheduler.jsonnet
     expose:
@@ -52,7 +52,7 @@ services:
     - ./config:/config
 
   browser:
-    image: ghcr.io/buildbarn/bb-browser:20240613T055327Z-f0fbe96
+    image: ghcr.io/buildbarn/bb-browser:20240930T111151Z-af89e4b
     command:
     - /config/browser.jsonnet
     expose:
@@ -63,13 +63,13 @@ services:
     - ./config:/config
 
   runner-installer:
-    image: ghcr.io/buildbarn/bb-runner-installer:20240716T044555Z-9850e82
+    image: ghcr.io/buildbarn/bb-runner-installer:20241010T174523Z-2c788ba
     volumes:
     - ./volumes/bb:/bb
 
   # The FUSE worker is the most efficient configuration.
   worker-fuse-ubuntu22-04:
-    image: ghcr.io/buildbarn/bb-worker:20240716T044555Z-9850e82
+    image: ghcr.io/buildbarn/bb-worker:20241010T174523Z-2c788ba
     command:
     - /config/worker-fuse-ubuntu22-04.jsonnet
     # Need to be privileged for the FUSE mounting to work.
@@ -105,7 +105,7 @@ services:
   # For situations where the more efficient FUSE worker is not supported,
   # the classic hardlinking example is shown here.
   worker-hardlinking-ubuntu22-04:
-    image: ghcr.io/buildbarn/bb-worker:20240716T044555Z-9850e82
+    image: ghcr.io/buildbarn/bb-worker:20241010T174523Z-2c788ba
     command:
     - /config/worker-hardlinking-ubuntu22-04.jsonnet
     privileged: false