Skip to content

Commit

Permalink
Upgrade all dependencies
Browse files Browse the repository at this point in the history 
This requires us to catch up with API changes to pkg/filesystem/path.
  • Loading branch information
@EdSchouten
EdSchouten committed Aug 31, 2024
1 parent 58ffbe3 commit 2da0393
Show file tree
Hide file tree
Showing 47 changed files with 264 additions and 174 deletions.
18 changes: 9 additions & 9 deletions MODULE.bazel
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
module(name = "com_github_buildbarn_bb_remote_execution")

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 = "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 = "protobuf", version = "27.1")
bazel_dep(name = "rules_go", version = "0.48.1")
bazel_dep(name = "protobuf", version = "27.3")
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")

git_override(
module_name = "com_github_buildbarn_bb_storage",
commit = "a869915feea7333a85e92e7a9f7a4821969408d6",
commit = "af9ad48525bbf476d0a0999760b648e1e96237e5",
remote = "https://github.com/buildbarn/bb-storage.git",
)

Expand Down
185 changes: 111 additions & 74 deletions MODULE.bazel.lock
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions cmd/bb_runner/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ func main() {
}

buildDirectoryPath, scopeWalker := path.EmptyBuilder.Join(path.NewAbsoluteScopeWalker(path.VoidComponentWalker))
if err := path.Resolve(path.NewLocalParser(configuration.BuildDirectoryPath), scopeWalker); err != nil {
if err := path.Resolve(path.LocalFormat.NewParser(configuration.BuildDirectoryPath), scopeWalker); err != nil {
return util.StatusWrapf(err, "Failed to resolve build directory %#v", configuration.BuildDirectoryPath)
}
buildDirectory := re_filesystem.NewLazyDirectory(
Expand Down Expand Up @@ -108,7 +108,7 @@ func main() {
// build actions aren't visible to successive actions. This also
// prevents systems from running out of disk space.
for _, d := range configuration.CleanTemporaryDirectories {
directory, err := filesystem.NewLocalDirectory(path.NewLocalParser(d))
directory, err := filesystem.NewLocalDirectory(path.LocalFormat.NewParser(d))
if err != nil {
return util.StatusWrapf(err, "Failed to open temporary directory %#v", d)
}
Expand Down
2 changes: 1 addition & 1 deletion cmd/bb_virtual_tmp/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ func main() {

// Create symbolic link whose target can be set by users.
buildDirectory, scopeWalker := path.EmptyBuilder.Join(path.VoidScopeWalker)
if err := path.Resolve(path.NewUNIXParser(configuration.BuildDirectoryPath), scopeWalker); err != nil {
if err := path.Resolve(path.UNIXFormat.NewParser(configuration.BuildDirectoryPath), scopeWalker); err != nil {
return util.StatusWrap(err, "Failed to resolve build directory path")
}
userSettableSymlink := virtual.NewUserSettableSymlink(buildDirectory)
Expand Down
4 changes: 2 additions & 2 deletions cmd/bb_worker/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ func main() {
case *bb_worker.BuildDirectoryConfiguration_Native:
// Directory where actual builds take place.
nativeConfiguration := backend.Native
naiveBuildDirectory, err = filesystem.NewLocalDirectory(path.NewLocalParser(nativeConfiguration.BuildDirectoryPath))
naiveBuildDirectory, err = filesystem.NewLocalDirectory(path.LocalFormat.NewParser(nativeConfiguration.BuildDirectoryPath))
if err != nil {
return util.StatusWrapf(err, "Failed to open build directory %v", nativeConfiguration.BuildDirectoryPath)
}
Expand All @@ -262,7 +262,7 @@ func main() {
// TODO: Have a single process-wide hardlinking
// cache even if multiple build directories are
// used. This increases cache hit rate.
cacheDirectory, err := filesystem.NewLocalDirectory(path.NewLocalParser(nativeConfiguration.CacheDirectoryPath))
cacheDirectory, err := filesystem.NewLocalDirectory(path.LocalFormat.NewParser(nativeConfiguration.CacheDirectoryPath))
if err != nil {
return util.StatusWrapf(err, "Failed to open cache directory %#v", nativeConfiguration.CacheDirectoryPath)
}
Expand Down
54 changes: 27 additions & 27 deletions go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,49 +1,49 @@
module github.com/buildbarn/bb-remote-execution

go 1.22.4
go 1.23.0

// Using the most recent version causes a cyclic dependency in protoc.
replace google.golang.org/protobuf => google.golang.org/protobuf v1.32.0

require (
cloud.google.com/go/longrunning v0.5.12
github.com/bazelbuild/buildtools v0.0.0-20240804201302-37932ddd7230
cloud.google.com/go/longrunning v0.6.0
github.com/bazelbuild/buildtools v0.0.0-20240827154017-dd10159baa91
github.com/bazelbuild/remote-apis v0.0.0-20240703191324-0d21f29acdb9
github.com/buildbarn/bb-storage v0.0.0-20240819085035-a869915feea7
github.com/buildbarn/bb-storage v0.0.0-20240831193755-af9ad48525bb
github.com/buildbarn/go-xdr v0.0.0-20240702182809-236788cf9e89
github.com/golang/protobuf v1.5.4
github.com/google/uuid v1.6.0
github.com/gorilla/mux v1.8.1
github.com/hanwen/go-fuse/v2 v2.5.1
github.com/jmespath/go-jmespath v0.4.0
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
github.com/prometheus/client_golang v1.20.0
github.com/prometheus/client_golang v1.20.2
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/otel v1.28.0
go.opentelemetry.io/otel/trace v1.28.0
go.opentelemetry.io/otel v1.29.0
go.opentelemetry.io/otel/trace v1.29.0
go.uber.org/mock v0.4.0
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616
golang.org/x/sync v0.8.0
golang.org/x/sys v0.24.0
google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142
google.golang.org/grpc v1.65.0
google.golang.org/genproto/googleapis/rpc v0.0.0-20240827150818-7e3bb234dfed
google.golang.org/grpc v1.66.0
google.golang.org/protobuf v1.34.2
mvdan.cc/gofumpt v0.7.0
)

require (
cloud.google.com/go v0.115.1 // indirect
cloud.google.com/go/auth v0.8.1 // indirect
cloud.google.com/go/auth v0.9.2 // indirect
cloud.google.com/go/auth/oauth2adapt v0.2.4 // indirect
cloud.google.com/go/compute/metadata v0.5.0 // indirect
cloud.google.com/go/iam v1.1.13 // indirect
cloud.google.com/go/iam v1.2.0 // indirect
cloud.google.com/go/storage v1.43.0 // indirect
github.com/aohorodnyk/mimeheader v0.0.6 // indirect
github.com/aws/aws-sdk-go-v2 v1.30.4 // indirect
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.4 // indirect
github.com/aws/aws-sdk-go-v2/config v1.27.28 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.17.28 // indirect
github.com/aws/aws-sdk-go-v2/config v1.27.31 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.17.30 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.12 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.16 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.16 // indirect
Expand All @@ -53,10 +53,10 @@ require (
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.18 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.18 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.16 // indirect
github.com/aws/aws-sdk-go-v2/service/s3 v1.59.0 // indirect
github.com/aws/aws-sdk-go-v2/service/s3 v1.61.0 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.22.5 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.5 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.30.4 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.30.5 // indirect
github.com/aws/smithy-go v1.20.4 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
Expand All @@ -71,7 +71,7 @@ require (
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/go-jsonnet v0.20.0 // indirect
github.com/google/s2a-go v0.1.8 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.3 // indirect
github.com/googleapis/gax-go/v2 v2.13.0 // indirect
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
Expand All @@ -81,17 +81,17 @@ require (
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.55.0 // indirect
github.com/prometheus/common v0.57.0 // indirect
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.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/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
go.opentelemetry.io/contrib/propagators/b3 v1.29.0 // indirect
go.opentelemetry.io/otel/exporters/jaeger v1.17.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/exporters/otlp/otlptrace v1.29.0 // indirect
go.opentelemetry.io/otel/metric v1.29.0 // indirect
go.opentelemetry.io/otel/sdk v1.29.0 // indirect
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
golang.org/x/crypto v0.26.0 // indirect
golang.org/x/mod v0.20.0 // indirect
Expand All @@ -100,10 +100,10 @@ require (
golang.org/x/text v0.17.0 // indirect
golang.org/x/time v0.6.0 // indirect
golang.org/x/tools v0.24.0 // indirect
google.golang.org/api v0.192.0 // indirect
google.golang.org/genproto v0.0.0-20240814211410-ddb44dafa142 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 // indirect
google.golang.org/genproto/googleapis/bytestream v0.0.0-20240814211410-ddb44dafa142 // indirect
google.golang.org/api v0.195.0 // indirect
google.golang.org/genproto v0.0.0-20240827150818-7e3bb234dfed // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240827150818-7e3bb234dfed // indirect
google.golang.org/genproto/googleapis/bytestream v0.0.0-20240827150818-7e3bb234dfed // indirect
google.golang.org/grpc/security/advancedtls v1.0.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
sigs.k8s.io/yaml v1.4.0 // indirect
Expand Down
Loading

0 comments on commit 2da0393

Please sign in to comment.