Skip to content

Commit

Permalink
Upgrade Buildbarn components 2024-07-15 (#142)
Browse files Browse the repository at this point in the history
  • Loading branch information
stagnation authored Aug 18, 2024
1 parent 1aaf14b commit 046460c
Show file tree
Hide file tree
Showing 17 changed files with 308 additions and 286 deletions.
20 changes: 10 additions & 10 deletions MODULE.bazel
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
module(name = "com_github_buildbarn_bb_deployments")

bazel_dep(name = "abseil-cpp", version = "20240116.2")
bazel_dep(name = "aspect_bazel_lib", version = "2.6.0")
bazel_dep(name = "aspect_rules_js", version = "1.39.1")
bazel_dep(name = "aspect_bazel_lib", version = "2.7.8")
bazel_dep(name = "aspect_rules_js", version = "1.42.3")
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")
Expand All @@ -11,16 +11,16 @@ bazel_dep(name = "gazelle", version = "0.35.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.1.0")
bazel_dep(name = "protobuf", version = "26.0")
bazel_dep(name = "opentelemetry-proto", version = "1.3.1")
bazel_dep(name = "protobuf", version = "27.1")
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.46.0")
bazel_dep(name = "rules_go", version = "0.48.1")
bazel_dep(name = "rules_jsonnet", version = "0.6.0")
bazel_dep(name = "rules_oci", version = "1.7.5")
bazel_dep(name = "rules_oci", version = "1.7.6")
bazel_dep(name = "rules_pkg", version = "0.10.1")
bazel_dep(name = "rules_proto", version = "6.0.0-rc2")
bazel_dep(name = "rules_proto", version = "6.0.2")
bazel_dep(name = "toolchains_llvm", version = "1.0.0")

# # Workarounds 2026-06-27
Expand Down Expand Up @@ -79,19 +79,19 @@ git_override(

git_override(
module_name = "com_github_buildbarn_bb_remote_execution",
commit = "2bcc408397c4653598e2714a0206f909948b9b48",
commit = "f6cf6bb8e5e354f49d657dd72a2c1a15ab88dcec",
remote = "https://github.com/buildbarn/bb-remote-execution.git",
)

git_override(
module_name = "com_github_buildbarn_bb_storage",
commit = "221b6361e1782acb258afc37f4a8642ac333e301",
commit = "24d544b34a866f55838d576a0b110f4495f04450",
remote = "https://github.com/buildbarn/bb-storage.git",
)

git_override(
module_name = "com_github_buildbarn_go_xdr",
commit = "db84b3d958968890d3370a7a176a802f564b85e7",
commit = "236788cf9e8948a1e8875c7dd243e2be180cdfd7",
remote = "https://github.com/buildbarn/go-xdr.git",
)

Expand Down
223 changes: 117 additions & 106 deletions MODULE.bazel.lock

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ 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) [`2bcc408397`](https://github.com/buildbarn/bb-remote-execution/commits/2bcc408397c4653598e2714a0206f909948b9b48)<br/>2023-10-04 10:23:25 UTC | [ghcr.io/buildbarn/bb-runner-installer:20240622T064858Z-2bcc408](https://ghcr.io/buildbarn/bb-runner-installer:20240622T064858Z-2bcc408)<br/>[ghcr.io/buildbarn/bb-scheduler:20240622T064858Z-2bcc408](https://ghcr.io/buildbarn/bb-scheduler:20240622T064858Z-2bcc408)<br/>[ghcr.io/buildbarn/bb-worker:20240622T064858Z-2bcc408](https://ghcr.io/buildbarn/bb-worker:20240622T064858Z-2bcc408)<br/>[CI artifacts](https://github.com/buildbarn/bb-remote-execution/actions/runs/9623638997) |
| [bb-storage](https://github.com/buildbarn/bb-storage) [`221b6361e1`](https://github.com/buildbarn/bb-storage/commits/221b6361e1782acb258afc37f4a8642ac333e301)<br/>2023-10-08 11:11:12 UTC | [ghcr.io/buildbarn/bb-storage:20240622T193351Z-221b636](https://ghcr.io/buildbarn/bb-storage:20240622T193351Z-221b636)<br/>[CI artifacts](https://github.com/buildbarn/bb-storage/actions/runs/9627832502) |
| [bb-remote-execution](https://github.com/buildbarn/bb-remote-execution) [`f6cf6bb8e5`](https://github.com/buildbarn/bb-remote-execution/commits/f6cf6bb8e5e354f49d657dd72a2c1a15ab88dcec)<br/>2023-10-04 10:23:25 UTC | [ghcr.io/buildbarn/bb-runner-installer:20240715T102010Z-f6cf6bb](https://ghcr.io/buildbarn/bb-runner-installer:20240715T102010Z-f6cf6bb)<br/>[ghcr.io/buildbarn/bb-scheduler:20240715T102010Z-f6cf6bb](https://ghcr.io/buildbarn/bb-scheduler:20240715T102010Z-f6cf6bb)<br/>[ghcr.io/buildbarn/bb-worker:20240715T102010Z-f6cf6bb](https://ghcr.io/buildbarn/bb-worker:20240715T102010Z-f6cf6bb)<br/>[CI artifacts](https://github.com/buildbarn/bb-remote-execution/actions/runs/9937684477) |
| [bb-storage](https://github.com/buildbarn/bb-storage) [`24d544b34a`](https://github.com/buildbarn/bb-storage/commits/24d544b34a866f55838d576a0b110f4495f04450)<br/>2023-10-08 11:11:12 UTC | [ghcr.io/buildbarn/bb-storage:20240714T184744Z-24d544b](https://ghcr.io/buildbarn/bb-storage:20240714T184744Z-24d544b)<br/>[CI artifacts](https://github.com/buildbarn/bb-storage/actions/runs/9929986747) |

## Changelog

Expand Down
3 changes: 2 additions & 1 deletion bare/config/worker.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ local common = import 'common.libsonnet';
cacheReplacementPolicy: 'LEAST_RECENTLY_USED',
},
runners: [{
# https://github.com/grpc/grpc/blob/master/doc/naming.md
// https://github.com/grpc/grpc/blob/master/doc/naming.md
endpoint: { address: 'unix:worker/runner' },
concurrency: 8,
platform: {},
Expand All @@ -27,6 +27,7 @@ local common = import 'common.libsonnet';
},
}],
}],
inputDownloadConcurrency: 10,
outputUploadConcurrency: 11,
directoryCache: {
maximumCount: 1000,
Expand Down
7 changes: 7 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
# 2024-07-15

* Make input root population for hardlinking workers run in parallel
* Automatic negotiation of NFSv4 minor version
* Add an NFSv4.1 server
* Better support for Windows filesystem operations

# 2024-06-27

* Better support for windows paths in the filesystem layer
Expand Down
1 change: 1 addition & 0 deletions docker-compose/config/worker-fuse-ubuntu22-04.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ local common = import 'common.libsonnet';
},
},
},
inputDownloadConcurrency: 10,
outputUploadConcurrency: 11,
directoryCache: {
maximumCount: 1000,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ local common = import 'common.libsonnet';
},
}],
}],
inputDownloadConcurrency: 10,
outputUploadConcurrency: 11,
directoryCache: {
maximumCount: 1000,
Expand Down
14 changes: 7 additions & 7 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:20240622T193351Z-221b636
image: ghcr.io/buildbarn/bb-storage:20240714T184744Z-24d544b
command:
- /config/frontend.jsonnet
expose:
Expand All @@ -12,7 +12,7 @@ services:
- ./config:/config

storage-0:
image: ghcr.io/buildbarn/bb-storage:20240622T193351Z-221b636
image: ghcr.io/buildbarn/bb-storage:20240714T184744Z-24d544b
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:20240622T193351Z-221b636
image: ghcr.io/buildbarn/bb-storage:20240714T184744Z-24d544b
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:20240622T064858Z-2bcc408
image: ghcr.io/buildbarn/bb-scheduler:20240715T102010Z-f6cf6bb
command:
- /config/scheduler.jsonnet
expose:
Expand All @@ -63,13 +63,13 @@ services:
- ./config:/config

runner-installer:
image: ghcr.io/buildbarn/bb-runner-installer:20240622T064858Z-2bcc408
image: ghcr.io/buildbarn/bb-runner-installer:20240715T102010Z-f6cf6bb
volumes:
- ./volumes/bb:/bb

# The FUSE worker is the most efficient configuration.
worker-fuse-ubuntu22-04:
image: ghcr.io/buildbarn/bb-worker:20240622T064858Z-2bcc408
image: ghcr.io/buildbarn/bb-worker:20240715T102010Z-f6cf6bb
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:20240622T064858Z-2bcc408
image: ghcr.io/buildbarn/bb-worker:20240715T102010Z-f6cf6bb
command:
- /config/worker-hardlinking-ubuntu22-04.jsonnet
privileged: false
Expand Down
96 changes: 48 additions & 48 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -17,54 +17,54 @@ replace go.opentelemetry.io/otel/trace v1.25.0 => go.opentelemetry.io/otel/trace
require (
github.com/bazelbuild/rules_go v0.43.0
github.com/buildbarn/bb-browser v0.0.0-20240613055327-f0fbe96530b0
github.com/buildbarn/bb-remote-execution v0.0.0-20240622064858-2bcc408397c4
github.com/buildbarn/bb-storage v0.0.0-20240622193351-221b6361e178
github.com/buildbarn/bb-remote-execution v0.0.0-20240715102010-f6cf6bb8e5e3
github.com/buildbarn/bb-storage v0.0.0-20240714184744-24d544b34a86
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616
mvdan.cc/gofumpt v0.6.0
)

require (
cloud.google.com/go v0.115.0 // indirect
cloud.google.com/go/auth v0.6.0 // indirect
cloud.google.com/go/auth/oauth2adapt v0.2.2 // indirect
cloud.google.com/go/compute/metadata v0.3.0 // indirect
cloud.google.com/go/iam v1.1.9 // indirect
cloud.google.com/go/longrunning v0.5.8 // indirect
cloud.google.com/go/storage v1.42.0 // indirect
cloud.google.com/go/auth v0.7.1 // indirect
cloud.google.com/go/auth/oauth2adapt v0.2.3 // indirect
cloud.google.com/go/compute/metadata v0.5.0 // indirect
cloud.google.com/go/iam v1.1.11 // indirect
cloud.google.com/go/longrunning v0.5.10 // indirect
cloud.google.com/go/storage v1.43.0 // indirect
git.sr.ht/~sbinet/gg v0.5.0 // indirect
github.com/ajstarks/svgo v0.0.0-20211024235047-1546f124cd8b // indirect
github.com/aohorodnyk/mimeheader v0.0.6 // indirect
github.com/aws/aws-sdk-go-v2 v1.30.0 // indirect
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.2 // indirect
github.com/aws/aws-sdk-go-v2/config v1.27.22 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.17.22 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.8 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.12 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.12 // indirect
github.com/aws/aws-sdk-go-v2 v1.30.3 // indirect
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.3 // indirect
github.com/aws/aws-sdk-go-v2/config v1.27.26 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.17.26 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.11 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.15 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.15 // indirect
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 // indirect
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.12 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.2 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.14 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.14 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.12 // indirect
github.com/aws/aws-sdk-go-v2/service/s3 v1.57.0 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.22.0 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.0 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.30.0 // indirect
github.com/aws/smithy-go v1.20.2 // indirect
github.com/bazelbuild/remote-apis v0.0.0-20240624103912-e64c68affcef // indirect
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.15 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.3 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.17 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.17 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.15 // indirect
github.com/aws/aws-sdk-go-v2/service/s3 v1.58.2 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.22.3 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.4 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.30.3 // indirect
github.com/aws/smithy-go v1.20.3 // indirect
github.com/bazelbuild/remote-apis v0.0.0-20240703191324-0d21f29acdb9 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/buildbarn/go-xdr v0.0.0-20240620192754-db84b3d95896 // indirect
github.com/buildbarn/go-xdr v0.0.0-20240702182809-236788cf9e89 // indirect
github.com/buildkite/terminal-to-html v3.2.0+incompatible // indirect
github.com/campoy/embedmd v1.0.0 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/dustin/go-humanize v1.0.1 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/fxtlabs/primes v0.0.0-20150821004651-dad82d10a449 // indirect
github.com/go-fonts/liberation v0.3.2 // indirect
github.com/go-fonts/liberation v0.3.3 // indirect
github.com/go-jose/go-jose/v3 v3.0.3 // indirect
github.com/go-latex/latex v0.0.0-20231108140139-5c1ce85aa4ea // indirect
github.com/go-latex/latex v0.0.0-20240709081214-31cef3c7570e // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-pdf/fpdf v0.9.0 // indirect
Expand Down Expand Up @@ -94,33 +94,33 @@ require (
github.com/prometheus/procfs v0.15.1 // indirect
github.com/sercand/kuberesolver/v5 v5.1.1 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect
go.opentelemetry.io/contrib/propagators/b3 v1.27.0 // indirect
go.opentelemetry.io/otel v1.27.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
go.opentelemetry.io/contrib/propagators/b3 v1.28.0 // indirect
go.opentelemetry.io/otel v1.28.0 // indirect
go.opentelemetry.io/otel/exporters/jaeger v1.17.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0 // indirect
go.opentelemetry.io/otel/metric v1.27.0 // indirect
go.opentelemetry.io/otel/sdk v1.27.0 // indirect
go.opentelemetry.io/otel/trace v1.27.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
go.opentelemetry.io/otel/metric v1.28.0 // indirect
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
go.opentelemetry.io/otel/trace v1.28.0 // indirect
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
golang.org/x/crypto v0.24.0 // indirect
golang.org/x/crypto v0.25.0 // indirect
golang.org/x/image v0.18.0 // indirect
golang.org/x/mod v0.18.0 // indirect
golang.org/x/net v0.26.0 // indirect
golang.org/x/mod v0.19.0 // indirect
golang.org/x/net v0.27.0 // indirect
golang.org/x/oauth2 v0.21.0 // indirect
golang.org/x/sync v0.7.0 // indirect
golang.org/x/sys v0.21.0 // indirect
golang.org/x/sys v0.22.0 // indirect
golang.org/x/text v0.16.0 // indirect
golang.org/x/time v0.5.0 // indirect
golang.org/x/tools v0.22.0 // indirect
golang.org/x/tools v0.23.0 // indirect
gonum.org/v1/plot v0.14.0 // indirect
google.golang.org/api v0.186.0 // indirect
google.golang.org/genproto v0.0.0-20240624140628-dc46fd24d27d // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240624140628-dc46fd24d27d // indirect
google.golang.org/genproto/googleapis/bytestream v0.0.0-20240624140628-dc46fd24d27d // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240624140628-dc46fd24d27d // indirect
google.golang.org/grpc v1.64.0 // indirect
google.golang.org/api v0.188.0 // indirect
google.golang.org/genproto v0.0.0-20240711142825-46eb208f015d // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240711142825-46eb208f015d // indirect
google.golang.org/genproto/googleapis/bytestream v0.0.0-20240711142825-46eb208f015d // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240711142825-46eb208f015d // indirect
google.golang.org/grpc v1.65.0 // indirect
google.golang.org/protobuf v1.34.2 // indirect
sigs.k8s.io/yaml v1.4.0 // indirect
)
Loading

0 comments on commit 046460c

Please sign in to comment.