Skip to content

Update Bazel version and Bzlmod deps #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tomcoldrick-ct merged 10 commits into from
Feb 13, 2025
Merged

Update Bazel version and Bzlmod deps #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ec825f6
Update Bazel to 7.2.0
mortenmj Jan 22, 2025
3d118fb
Update dependencies in MODULE.bazel
mortenmj Jan 22, 2025
7d254ec
Regenerate protos
mortenmj Jan 22, 2025
711168b
Update lockfile
mortenmj Feb 12, 2025
99cd847
Update more go deps
mortenmj Feb 12, 2025
6a0076c
Update bb-storage and remote-apis
mortenmj Feb 12, 2025
3ac53c2
Regenerate github workflows
mortenmj Feb 12, 2025
45368b4
Enable build file generation for github.com/cncf/xds/go
mortenmj Feb 12, 2025
8d62bf4
Add missing GetStorageTypeName method to assetBlobReplicatorCreator
mortenmj Feb 12, 2025
ec2ae0e
Add patch for o-search
mortenmj Feb 12, 2025
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
2 changes: 1 addition & 1 deletion .bazelversion
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.1.1
7.2.0
2 changes: 1 addition & 1 deletion .github/workflows/master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
},
{
"name": "Protobuf generation",
"run": "if [ -d bazel-bin/pkg/proto ]; then\n find . bazel-bin/pkg/proto -name '*.pb.go' -delete || true\n bazel build $(bazel query --output=label 'kind(\"go_proto_library\", //...)')\n find bazel-bin/pkg/proto -name '*.pb.go' | while read f; do\n cat $f > $(echo $f | sed -e 's|.*/pkg/proto/|pkg/proto/|')\n done\nfi\n"
"run": "if [ -d pkg/proto ]; then\n find . bazel-bin/pkg/proto -name '*.pb.go' -delete || true\n bazel build $(bazel query --output=label 'kind(\"go_proto_library\", //...)')\n find bazel-bin/pkg/proto -name '*.pb.go' | while read f; do\n cat $f > $(echo $f | sed -e 's|.*/pkg/proto/|pkg/proto/|')\n done\nfi\n"
},
{
"name": "Embedded asset generation",
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pull-requests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
},
{
"name": "Protobuf generation",
"run": "if [ -d bazel-bin/pkg/proto ]; then\n find . bazel-bin/pkg/proto -name '*.pb.go' -delete || true\n bazel build $(bazel query --output=label 'kind(\"go_proto_library\", //...)')\n find bazel-bin/pkg/proto -name '*.pb.go' | while read f; do\n cat $f > $(echo $f | sed -e 's|.*/pkg/proto/|pkg/proto/|')\n done\nfi\n"
"run": "if [ -d pkg/proto ]; then\n find . bazel-bin/pkg/proto -name '*.pb.go' -delete || true\n bazel build $(bazel query --output=label 'kind(\"go_proto_library\", //...)')\n find bazel-bin/pkg/proto -name '*.pb.go' | while read f; do\n cat $f > $(echo $f | sed -e 's|.*/pkg/proto/|pkg/proto/|')\n done\nfi\n"
},
{
"name": "Embedded asset generation",
Expand Down
28 changes: 16 additions & 12 deletions MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,32 +2,30 @@ module(name = "com_github_buildbarn_bb_remote_asset")

bazel_dep(name = "com_github_buildbarn_bb_storage")
bazel_dep(name = "bazel_remote_apis", version = "0.0.0")
bazel_dep(name = "gazelle", version = "0.38.0")
bazel_dep(name = "gazelle", version = "0.40.0")
bazel_dep(name = "googleapis", version = "0.0.0-20240819-fe8ba054a")
bazel_dep(name = "jsonnet_go", version = "0.20.0", repo_name = "google_jsonnet_go")
bazel_dep(name = "protobuf", version = "28.1")
bazel_dep(name = "jsonnet_go", version = "0.20.0")
bazel_dep(name = "protobuf", version = "29.1")
bazel_dep(name = "rules_go", version = "0.50.1")
bazel_dep(name = "rules_jsonnet", version = "0.6.0")
bazel_dep(name = "rules_proto", version = "6.0.2")
bazel_dep(name = "toolchains_llvm", version = "1.1.2")
bazel_dep(name = "rules_proto", version = "7.0.2")
bazel_dep(name = "toolchains_llvm", version = "1.2.0")

git_override(
module_name = "com_github_buildbarn_bb_storage",
commit = "8abbcfab01bcde294b20c2070baba9fd242bab7f",
commit = "07366c6f20a1af59514be32a349af56f1960a267",
remote = "https://github.com/buildbarn/bb-storage.git",
)

git_override(
module_name = "bazel_remote_apis",
commit = "6777112ef7defa6705b1ebd2831d6c7efeb12ba2",
commit = "253013303c9e1d52ebdeb5a3f0f869919e882f20",
remote = "https://github.com/bazelbuild/remote-apis.git",
)

git_override(
single_version_override(
module_name = "gazelle",
commit = "4d0129d7adae33e8e648d3624aff8fa8f93f375b",
patches = ["//:patches/gazelle/dont-flatten-srcs.diff"],
remote = "https://github.com/bazelbuild/bazel-gazelle.git",
)

go_deps = use_extension("@gazelle//:extensions.bzl", "go_deps")
Expand All @@ -46,12 +44,18 @@ use_repo(
)

go_deps_dev = use_extension("@gazelle//:extensions.bzl", "go_deps", dev_dependency = True)
go_deps_dev.gazelle_override(
build_file_generation = "on",
path = "github.com/cncf/xds/go",
)
go_deps_dev.module_override(
patches = ["@com_github_buildbarn_bb_storage//:patches/com_github_grpc_ecosystem_go_grpc_prometheus/client-metrics-prevent-handled-twice.diff"],
path = "github.com/grpc-ecosystem/go-grpc-prometheus",
)

http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
go_deps_dev.module_override(
patches = ["@com_github_buildbarn_bb_storage//:patches/org_golang_x_sys/o-search.diff"],
path = "golang.org/x/sys",
)

llvm = use_extension("@toolchains_llvm//toolchain/extensions:llvm.bzl", "llvm", dev_dependency = True)
llvm.toolchain(
Expand Down
13,125 changes: 2,476 additions & 10,649 deletions MODULE.bazel.lock
View file
Open in desktop

Large diffs are not rendered by default.

29 changes: 17 additions & 12 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,30 @@ toolchain go1.23.1
// Using the most recent version causes a cyclic dependency in protoc.
replace google.golang.org/protobuf => google.golang.org/protobuf v1.32.0

// https://github.com/bazel-contrib/rules_go/issues/4170
replace golang.org/x/tools => golang.org/x/tools v0.26.0

// rules_go doesn't support gomock's package mode.
replace go.uber.org/mock => go.uber.org/mock v0.4.0

require (
github.com/bazelbuild/buildtools v0.0.0-20240918101019-be1c24cc9a44
github.com/bazelbuild/remote-apis v0.0.0-20240926071355-6777112ef7de
github.com/bazelbuild/remote-apis v0.0.0-20241031050812-253013303c9e
github.com/buildbarn/bb-storage v0.0.0-20240928104605-8abbcfab01bc
github.com/golang/mock v1.7.0-rc.1
github.com/prometheus/client_golang v1.20.4
github.com/prometheus/client_golang v1.20.5
github.com/stretchr/testify v1.9.0
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616
google.golang.org/genproto/googleapis/rpc v0.0.0-20240924160255-9d4c2d233b61
google.golang.org/grpc v1.67.0
google.golang.org/protobuf v1.34.2
golang.org/x/lint v0.0.0-20241112194109-818c5a804067
google.golang.org/genproto/googleapis/rpc v0.0.0-20241113202542-65e8d215514f
google.golang.org/grpc v1.68.0
google.golang.org/protobuf v1.35.2
mvdan.cc/gofumpt v0.7.0
)

require (
cloud.google.com/go v0.115.1 // indirect
cloud.google.com/go/auth v0.9.5 // indirect
cloud.google.com/go/auth/oauth2adapt v0.2.4 // indirect
cloud.google.com/go/compute v1.28.1 // indirect
cloud.google.com/go/compute/metadata v0.5.2 // indirect
cloud.google.com/go/iam v1.2.1 // indirect
cloud.google.com/go/longrunning v0.6.1 // indirect
Expand Down Expand Up @@ -90,17 +95,17 @@ require (
go.opentelemetry.io/otel/sdk v1.30.0 // indirect
go.opentelemetry.io/otel/trace v1.30.0 // indirect
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
golang.org/x/crypto v0.27.0 // indirect
go.uber.org/mock v0.5.0 // indirect
golang.org/x/crypto v0.28.0 // indirect
golang.org/x/mod v0.21.0 // indirect
golang.org/x/net v0.29.0 // indirect
golang.org/x/net v0.30.0 // indirect
golang.org/x/oauth2 v0.23.0 // indirect
golang.org/x/sync v0.8.0 // indirect
golang.org/x/sys v0.25.0 // indirect
golang.org/x/text v0.18.0 // indirect
golang.org/x/sys v0.26.0 // indirect
golang.org/x/text v0.19.0 // indirect
golang.org/x/time v0.6.0 // indirect
golang.org/x/tools v0.25.0 // indirect
google.golang.org/api v0.199.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/genproto v0.0.0-20240924160255-9d4c2d233b61 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240924160255-9d4c2d233b61 // indirect
google.golang.org/genproto/googleapis/bytestream v0.0.0-20240924160255-9d4c2d233b61 // indirect
Expand Down
Loading