Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -111,19 +111,19 @@ git_override(

git_override(
module_name = "com_github_buildbarn_bb_browser",
commit = "9c1714be8cf55061c698b2e629e13496071e23a1",
commit = "9b44996f7d6a04185f61e7752cbe8649aaa59f16",
remote = "https://github.com/buildbarn/bb-browser.git",
)

git_override(
module_name = "com_github_buildbarn_bb_remote_execution",
commit = "31d23d1a2b0cf4c6785bc96e3576e439063d6b7c",
commit = "1c726bdc27e7793c685d8788913f8f91f59bc887",
remote = "https://github.com/buildbarn/bb-remote-execution.git",
)

git_override(
module_name = "com_github_buildbarn_bb_storage",
commit = "2600f229e4b68a92591109827f78b047a7fe4d01",
commit = "1d733a37487a01416bda38eff6f61eb78103c7f0",
remote = "https://github.com/buildbarn/bb-storage.git",
)

Expand Down
262 changes: 17 additions & 245 deletions MODULE.bazel.lock

Large diffs are not rendered by default.

15 changes: 3 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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) [`9c1714be8c`](https://github.com/buildbarn/bb-browser/commits/9c1714be8cf55061c698b2e629e13496071e23a1)<br/>2023-09-17 04:20:39 UTC | [ghcr.io/buildbarn/bb-browser:20250212T055122Z-9c1714b](https://ghcr.io/buildbarn/bb-browser:20250212T055122Z-9c1714b)<br/>[CI artifacts](https://github.com/buildbarn/bb-browser/actions/runs/13278991952) |
| [bb-remote-execution](https://github.com/buildbarn/bb-remote-execution) [`31d23d1a2b`](https://github.com/buildbarn/bb-remote-execution/commits/31d23d1a2b0cf4c6785bc96e3576e439063d6b7c)<br/>2023-10-04 10:23:25 UTC | [ghcr.io/buildbarn/bb-runner-installer:20250201T092335Z-31d23d1](https://ghcr.io/buildbarn/bb-runner-installer:20250201T092335Z-31d23d1)<br/>[ghcr.io/buildbarn/bb-scheduler:20250201T092335Z-31d23d1](https://ghcr.io/buildbarn/bb-scheduler:20250201T092335Z-31d23d1)<br/>[ghcr.io/buildbarn/bb-worker:20250201T092335Z-31d23d1](https://ghcr.io/buildbarn/bb-worker:20250201T092335Z-31d23d1)<br/>[CI artifacts](https://github.com/buildbarn/bb-remote-execution/actions/runs/13087286762) |
| [bb-storage](https://github.com/buildbarn/bb-storage) [`2600f229e4`](https://github.com/buildbarn/bb-storage/commits/2600f229e4b68a92591109827f78b047a7fe4d01)<br/>2023-10-08 11:11:12 UTC | [ghcr.io/buildbarn/bb-storage:20250213T085125Z-2600f22](https://ghcr.io/buildbarn/bb-storage:20250213T085125Z-2600f22)<br/>[CI artifacts](https://github.com/buildbarn/bb-storage/actions/runs/13303866642) |
| [bb-browser](https://github.com/buildbarn/bb-browser) [`9b44996f7d`](https://github.com/buildbarn/bb-browser/commits/9b44996f7d6a04185f61e7752cbe8649aaa59f16)<br/>2023-09-17 04:20:39 UTC | [ghcr.io/buildbarn/bb-browser:20250414T180739Z-9b44996](https://ghcr.io/buildbarn/bb-browser:20250414T180739Z-9b44996)<br/>[CI artifacts](https://github.com/buildbarn/bb-browser/actions/runs/14452582814) |
| [bb-remote-execution](https://github.com/buildbarn/bb-remote-execution) [`1c726bdc27`](https://github.com/buildbarn/bb-remote-execution/commits/1c726bdc27e7793c685d8788913f8f91f59bc887)<br/>2023-10-04 10:23:25 UTC | [ghcr.io/buildbarn/bb-runner-installer:20250411T124310Z-1c726bd](https://ghcr.io/buildbarn/bb-runner-installer:20250411T124310Z-1c726bd)<br/>[ghcr.io/buildbarn/bb-scheduler:20250411T124310Z-1c726bd](https://ghcr.io/buildbarn/bb-scheduler:20250411T124310Z-1c726bd)<br/>[ghcr.io/buildbarn/bb-worker:20250411T124310Z-1c726bd](https://ghcr.io/buildbarn/bb-worker:20250411T124310Z-1c726bd)<br/>[CI artifacts](https://github.com/buildbarn/bb-remote-execution/actions/runs/14403397088) |
| [bb-storage](https://github.com/buildbarn/bb-storage) [`1d733a3748`](https://github.com/buildbarn/bb-storage/commits/1d733a37487a01416bda38eff6f61eb78103c7f0)<br/>2023-10-08 11:11:12 UTC | [ghcr.io/buildbarn/bb-storage:20250408T112116Z-1d733a3](https://ghcr.io/buildbarn/bb-storage:20250408T112116Z-1d733a3)<br/>[CI artifacts](https://github.com/buildbarn/bb-storage/actions/runs/14332223689) |

## Changelog

Expand Down Expand Up @@ -194,19 +194,12 @@ First make sure the different Buildbarn components are in sync. Then perform:
# Update go.mod.
go mod tidy -e

# Regenerate go_dependencies.bzl.
bazel run //:gazelle -- update-repos -from_file=go.mod -to_macro go_dependencies.bzl%go_dependencies -prune
# Format go_dependencies.bzl according to GitHub Actions.
sed -i '/^$/d' go_dependencies.bzl
bazelisk run //:buildifier.check

# Update the Kubernetes and Docker compose deployments.
./tools/update-container-image-versions.sh
```

You might have to update the `WORKSPACE` file as well,
until `MODULE.bazel` is in place.

## Formatting

A number of linting and formatting steps are performed in the GitHub Actions flow.
Expand All @@ -217,8 +210,6 @@ Some of the steps are:
bazel run //:gazelle -- update-repos -from_file=go.mod -to_macro go_dependencies.bzl%go_dependencies -prune
bazel run //:gazelle
# Buildifier
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 -- -w -extra $PWD
Expand Down
18 changes: 8 additions & 10 deletions docker-compose/config/common.libsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -2,34 +2,32 @@
blobstore: {
contentAddressableStorage: {
sharding: {
hashInitialization: 11946695773637837490,
shards: [
{
shards: {
"0": {
backend: { grpc: { address: 'storage-0:8981' } },
weight: 1,
},
{
"1": {
backend: { grpc: { address: 'storage-1:8981' } },
weight: 1,
},
],
},
},
},
actionCache: {
completenessChecking: {
backend: {
sharding: {
hashInitialization: 14897363947481274433,
shards: [
{
shards: {
"0": {
backend: { grpc: { address: 'storage-0:8981' } },
weight: 1,
},
{
"1": {
backend: { grpc: { address: 'storage-1:8981' } },
weight: 1,
},
],
},
},
},
maximumTotalTreeSizeBytes: 64 * 1024 * 1024,
Expand Down
16 changes: 8 additions & 8 deletions docker-compose/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: '3'
services:
frontend:
image: ghcr.io/buildbarn/bb-storage:20250213T085125Z-2600f22
image: ghcr.io/buildbarn/bb-storage:20250408T112116Z-1d733a3
command:
- /config/frontend.jsonnet
expose:
Expand All @@ -12,7 +12,7 @@ services:
- ./config:/config

storage-0:
image: ghcr.io/buildbarn/bb-storage:20250213T085125Z-2600f22
image: ghcr.io/buildbarn/bb-storage:20250408T112116Z-1d733a3
command:
- /config/storage.jsonnet
expose:
Expand All @@ -24,7 +24,7 @@ services:
- ./volumes/storage-cas-0:/storage-cas

storage-1:
image: ghcr.io/buildbarn/bb-storage:20250213T085125Z-2600f22
image: ghcr.io/buildbarn/bb-storage:20250408T112116Z-1d733a3
command:
- /config/storage.jsonnet
expose:
Expand All @@ -36,7 +36,7 @@ services:
- ./volumes/storage-cas-1:/storage-cas

scheduler:
image: ghcr.io/buildbarn/bb-scheduler:20250201T092335Z-31d23d1
image: ghcr.io/buildbarn/bb-scheduler:20250411T124310Z-1c726bd
command:
- /config/scheduler.jsonnet
expose:
Expand All @@ -52,7 +52,7 @@ services:
- ./config:/config

browser:
image: ghcr.io/buildbarn/bb-browser:20250212T055122Z-9c1714b
image: ghcr.io/buildbarn/bb-browser:20250414T180739Z-9b44996
command:
- /config/browser.jsonnet
expose:
Expand All @@ -63,13 +63,13 @@ services:
- ./config:/config

runner-installer:
image: ghcr.io/buildbarn/bb-runner-installer:20250201T092335Z-31d23d1
image: ghcr.io/buildbarn/bb-runner-installer:20250411T124310Z-1c726bd
volumes:
- ./volumes/bb:/bb

# The FUSE worker is the most efficient configuration.
worker-fuse-ubuntu22-04:
image: ghcr.io/buildbarn/bb-worker:20250201T092335Z-31d23d1
image: ghcr.io/buildbarn/bb-worker:20250411T124310Z-1c726bd
command:
- /config/worker-fuse-ubuntu22-04.jsonnet
# Need to be privileged for the FUSE mounting to work.
Expand Down Expand Up @@ -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:20250201T092335Z-31d23d1
image: ghcr.io/buildbarn/bb-worker:20250411T124310Z-1c726bd
command:
- /config/worker-hardlinking-ubuntu22-04.jsonnet
privileged: false
Expand Down
Loading