Skip to content

Commit 053ca02

Browse files
committed
Upgrade all dependencies
This requires us to catch up with some minor API changes on the VFS side. - InitialNode is now called InitialChild. - InitialContentsFetcher no longer provides a GetContainingDigests() function. Instead, we need to call VirtualApply(). This is great, because we already need to do this for regular files, meaning the code on the bb_clientd side becomes simpler.
1 parent 8401896 commit 053ca02

File tree

14 files changed

+1293
-5738
lines changed

14 files changed

+1293
-5738
lines changed

.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.2.0
1+
8.0.1

.github/workflows/master.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@
3737
},
3838
{
3939
"name": "Protobuf generation",
40-
"run": "find . bazel-bin/pkg/proto -name '*.pb.go' -delete || true\nbazel build $(bazel query --output=label 'kind(\"go_proto_library\", //...)')\nfind bazel-bin/pkg/proto -name '*.pb.go' | while read f; do\n cat $f > $(echo $f | sed -e 's|.*/pkg/proto/|pkg/proto/|')\ndone\n"
40+
"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"
4141
},
4242
{
4343
"name": "Embedded asset generation",
44-
"run": "bazel build $(git grep '^[[:space:]]*//go:embed ' | sed -e 's|\\(.*\\)/.*//go:embed |//\\1:|' | sort -u)\ngit grep '^[[:space:]]*//go:embed ' | sed -e 's|\\(.*\\)/.*//go:embed |\\1/|' | while read o; do\n if [ -e \"bazel-bin/$o\" ]; then\n rm -rf \"$o\"\n cp -r \"bazel-bin/$o\" \"$o\"\n find \"$o\" -type f -exec chmod -x {} +\n fi\ndone\n"
44+
"run": "bazel build $(git grep '^[[:space:]]*//go:embed ' | sed -e 's|\\(.*\\)/.*//go:embed |//\\1:|; s|\"||g; s| .*||' | sort -u)\ngit grep '^[[:space:]]*//go:embed ' | sed -e 's|\\(.*\\)/.*//go:embed |\\1/|' | while read o; do\n if [ -e \"bazel-bin/$o\" ]; then\n rm -rf \"$o\"\n cp -r \"bazel-bin/$o\" \"$o\"\n find \"$o\" -type f -exec chmod -x {} +\n fi\ndone\n"
4545
},
4646
{
4747
"name": "Test style conformance",
@@ -165,7 +165,7 @@
165165
},
166166
{
167167
"name": "windows_amd64: build and test",
168-
"run": "bazel build --platforms=@rules_go//go/toolchain:windows_amd64 //..."
168+
"run": "bazel build --platforms=@rules_go//go/toolchain:windows_amd64 //cmd/bb_clientd"
169169
},
170170
{
171171
"name": "windows_amd64: copy bb_clientd",
@@ -213,6 +213,7 @@
213213
"on": {
214214
"push": {
215215
"branches": [
216+
"main",
216217
"master"
217218
]
218219
}

.github/workflows/pull-requests.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@
3737
},
3838
{
3939
"name": "Protobuf generation",
40-
"run": "find . bazel-bin/pkg/proto -name '*.pb.go' -delete || true\nbazel build $(bazel query --output=label 'kind(\"go_proto_library\", //...)')\nfind bazel-bin/pkg/proto -name '*.pb.go' | while read f; do\n cat $f > $(echo $f | sed -e 's|.*/pkg/proto/|pkg/proto/|')\ndone\n"
40+
"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"
4141
},
4242
{
4343
"name": "Embedded asset generation",
44-
"run": "bazel build $(git grep '^[[:space:]]*//go:embed ' | sed -e 's|\\(.*\\)/.*//go:embed |//\\1:|' | sort -u)\ngit grep '^[[:space:]]*//go:embed ' | sed -e 's|\\(.*\\)/.*//go:embed |\\1/|' | while read o; do\n if [ -e \"bazel-bin/$o\" ]; then\n rm -rf \"$o\"\n cp -r \"bazel-bin/$o\" \"$o\"\n find \"$o\" -type f -exec chmod -x {} +\n fi\ndone\n"
44+
"run": "bazel build $(git grep '^[[:space:]]*//go:embed ' | sed -e 's|\\(.*\\)/.*//go:embed |//\\1:|; s|\"||g; s| .*||' | sort -u)\ngit grep '^[[:space:]]*//go:embed ' | sed -e 's|\\(.*\\)/.*//go:embed |\\1/|' | while read o; do\n if [ -e \"bazel-bin/$o\" ]; then\n rm -rf \"$o\"\n cp -r \"bazel-bin/$o\" \"$o\"\n find \"$o\" -type f -exec chmod -x {} +\n fi\ndone\n"
4545
},
4646
{
4747
"name": "Test style conformance",
@@ -81,7 +81,7 @@
8181
},
8282
{
8383
"name": "windows_amd64: build and test",
84-
"run": "bazel build --platforms=@rules_go//go/toolchain:windows_amd64 //..."
84+
"run": "bazel build --platforms=@rules_go//go/toolchain:windows_amd64 //cmd/bb_clientd"
8585
}
8686
]
8787
}
@@ -90,6 +90,7 @@
9090
"on": {
9191
"pull_request": {
9292
"branches": [
93+
"main",
9394
"master"
9495
]
9596
}

MODULE.bazel

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@ bazel_dep(name = "bazel_remote_apis", version = "0.0.0")
44
bazel_dep(name = "com_github_buildbarn_bb_remote_execution")
55
bazel_dep(name = "com_github_buildbarn_bb_storage")
66
bazel_dep(name = "com_github_buildbarn_go_xdr")
7-
bazel_dep(name = "gazelle", version = "0.37.0")
7+
bazel_dep(name = "gazelle", version = "0.42.0")
88
bazel_dep(name = "jsonnet_go", version = "0.20.0")
9-
bazel_dep(name = "protobuf", version = "27.1")
9+
bazel_dep(name = "protobuf", version = "29.3")
1010
bazel_dep(name = "rules_jsonnet", version = "0.6.0")
11-
bazel_dep(name = "rules_go", version = "0.48.1")
12-
bazel_dep(name = "rules_pkg", version = "0.10.1")
13-
bazel_dep(name = "toolchains_llvm", version = "1.0.0")
11+
bazel_dep(name = "rules_go", version = "0.53.0")
12+
bazel_dep(name = "rules_pkg", version = "1.0.1")
13+
bazel_dep(name = "rules_proto", version = "7.1.0")
14+
bazel_dep(name = "toolchains_llvm", version = "1.3.0")
1415

1516
git_override(
1617
module_name = "bazel_remote_apis",
@@ -20,13 +21,13 @@ git_override(
2021

2122
git_override(
2223
module_name = "com_github_buildbarn_bb_remote_execution",
23-
commit = "bf32d1897971edde42a59636c8103b09a72196ae",
24+
commit = "ca77ec14e14dd5d5569bde757dc7b6743496e198",
2425
remote = "https://github.com/buildbarn/bb-remote-execution.git",
2526
)
2627

2728
git_override(
2829
module_name = "com_github_buildbarn_bb_storage",
29-
commit = "256ec6c483a05f1aeefff6fc57a2044f746c5a08",
30+
commit = "85aafcb236ac1365a693d9390a6813db99dbaa0f",
3031
remote = "https://github.com/buildbarn/bb-storage.git",
3132
)
3233

@@ -36,6 +37,11 @@ git_override(
3637
remote = "https://github.com/buildbarn/go-xdr.git",
3738
)
3839

40+
single_version_override(
41+
module_name = "jsonnet",
42+
patches = ["//:patches/jsonnet/bazel-8.diff"],
43+
)
44+
3945
git_override(
4046
module_name = "rules_antlr",
4147
commit = "89a29cca479363a5aee53e203719510bdc6be6ff",
@@ -62,6 +68,10 @@ use_repo(
6268
)
6369

6470
go_deps_dev = use_extension("@gazelle//:extensions.bzl", "go_deps", dev_dependency = True)
71+
go_deps_dev.gazelle_override(
72+
build_file_generation = "on",
73+
path = "github.com/cncf/xds/go",
74+
)
6575
go_deps_dev.module_override(
6676
patches = ["@com_github_buildbarn_bb_storage//:patches/com_github_grpc_ecosystem_go_grpc_prometheus/client-metrics-prevent-handled-twice.diff"],
6777
path = "github.com/grpc-ecosystem/go-grpc-prometheus",
@@ -74,6 +84,10 @@ go_deps_dev.module_override(
7484
],
7585
path = "github.com/hanwen/go-fuse/v2",
7686
)
87+
go_deps_dev.module_override(
88+
patches = ["@com_github_buildbarn_bb_storage//:patches/org_golang_x_sys/o-search.diff"],
89+
path = "golang.org/x/sys",
90+
)
7791
go_deps_dev.module_override(
7892
patches = ["@com_github_buildbarn_bb_storage//:patches/org_golang_google_genproto_googleapis_bytestream/service-registrar.diff"],
7993
path = "google.golang.org/genproto/googleapis/bytestream",

0 commit comments

Comments
 (0)