Skip to content

Commit ca77ec1

Browse files
committed
Upgrade all dependencies
We now use Bazel 8. Bringing in the latest version of bb-storage requires us to catch up with some API changes related to authentication/authorization.
1 parent fa73422 commit ca77ec1

39 files changed

+2659
-8643
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",
@@ -669,7 +669,7 @@
669669
},
670670
{
671671
"name": "windows_amd64: build and test",
672-
"run": "bazel build --platforms=@rules_go//go/toolchain:windows_amd64 //..."
672+
"run": "bazel build --platforms=@rules_go//go/toolchain:windows_amd64 //cmd/bb_noop_worker //cmd/bb_runner //cmd/bb_scheduler //cmd/bb_virtual_tmp //cmd/bb_worker //cmd/fake_python //cmd/fake_xcrun"
673673
},
674674
{
675675
"name": "windows_amd64: copy bb_noop_worker",
@@ -789,6 +789,7 @@
789789
"on": {
790790
"push": {
791791
"branches": [
792+
"main",
792793
"master"
793794
]
794795
}

.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_noop_worker //cmd/bb_runner //cmd/bb_scheduler //cmd/bb_virtual_tmp //cmd/bb_worker //cmd/fake_python //cmd/fake_xcrun"
8585
}
8686
]
8787
}
@@ -90,6 +90,7 @@
9090
"on": {
9191
"pull_request": {
9292
"branches": [
93+
"main",
9394
"master"
9495
]
9596
}

MODULE.bazel

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
module(name = "com_github_buildbarn_bb_remote_execution")
22

3-
bazel_dep(name = "aspect_bazel_lib", version = "2.8.1")
4-
bazel_dep(name = "aspect_rules_js", version = "2.0.1")
3+
bazel_dep(name = "aspect_bazel_lib", version = "2.13.0")
4+
bazel_dep(name = "aspect_rules_js", version = "2.2.0")
55
bazel_dep(name = "bazel_remote_apis", version = "0.0.0")
66
bazel_dep(name = "com_github_buildbarn_bb_storage")
77
bazel_dep(name = "com_github_buildbarn_go_xdr")
8-
bazel_dep(name = "gazelle", version = "0.38.0")
9-
bazel_dep(name = "googleapis", version = "0.0.0-20240326-1c8d509c5")
10-
bazel_dep(name = "protobuf", version = "27.3")
11-
bazel_dep(name = "rules_go", version = "0.50.0")
8+
bazel_dep(name = "gazelle", version = "0.42.0")
9+
bazel_dep(name = "googleapis", version = "0.0.0-20241220-5e258e33")
10+
bazel_dep(name = "protobuf", version = "29.3")
11+
bazel_dep(name = "rules_go", version = "0.53.0")
1212
bazel_dep(name = "rules_jsonnet", version = "0.6.0")
13-
bazel_dep(name = "rules_oci", version = "1.8.0")
13+
bazel_dep(name = "rules_oci", version = "2.2.2")
1414
bazel_dep(name = "rules_pkg", version = "1.0.1")
15-
bazel_dep(name = "rules_proto", version = "6.0.2")
16-
bazel_dep(name = "toolchains_llvm", version = "1.1.2")
15+
bazel_dep(name = "rules_proto", version = "7.1.0")
16+
bazel_dep(name = "toolchains_llvm", version = "1.3.0")
1717

1818
git_override(
1919
module_name = "bazel_remote_apis",
20-
commit = "a6328f5026d3b2ae27bd8efd86a0f1057ccab361",
20+
commit = "7f922028fcfac63bdd8431e68de152d9e7a9e2a0",
2121
remote = "https://github.com/bazelbuild/remote-apis.git",
2222
)
2323

2424
git_override(
2525
module_name = "com_github_buildbarn_bb_storage",
26-
commit = "256ec6c483a05f1aeefff6fc57a2044f746c5a08",
26+
commit = "85aafcb236ac1365a693d9390a6813db99dbaa0f",
2727
remote = "https://github.com/buildbarn/bb-storage.git",
2828
)
2929

@@ -33,6 +33,11 @@ git_override(
3333
remote = "https://github.com/buildbarn/go-xdr.git",
3434
)
3535

36+
single_version_override(
37+
module_name = "jsonnet",
38+
patches = ["//:patches/jsonnet/bazel-8.diff"],
39+
)
40+
3641
git_override(
3742
module_name = "rules_antlr",
3843
commit = "89a29cca479363a5aee53e203719510bdc6be6ff",
@@ -81,6 +86,10 @@ use_repo(
8186
)
8287

8388
go_deps_dev = use_extension("@gazelle//:extensions.bzl", "go_deps", dev_dependency = True)
89+
go_deps_dev.gazelle_override(
90+
build_file_generation = "on",
91+
path = "github.com/cncf/xds/go",
92+
)
8493
go_deps_dev.module_override(
8594
patches = ["@com_github_buildbarn_bb_storage//:patches/com_github_grpc_ecosystem_go_grpc_prometheus/client-metrics-prevent-handled-twice.diff"],
8695
path = "github.com/grpc-ecosystem/go-grpc-prometheus",
@@ -97,6 +106,10 @@ go_deps_dev.module_override(
97106
patches = ["@com_github_buildbarn_bb_storage//:patches/org_golang_x_lint/generic.diff"],
98107
path = "golang.org/x/lint",
99108
)
109+
go_deps_dev.module_override(
110+
patches = ["@com_github_buildbarn_bb_storage//:patches/org_golang_x_sys/o-search.diff"],
111+
path = "golang.org/x/sys",
112+
)
100113
go_deps_dev.module_override(
101114
patches = [
102115
"@com_github_buildbarn_bb_storage//:patches/org_uber_go_mock/mocks-for-funcs.diff",
@@ -157,4 +170,4 @@ oci.pull(
157170
"linux/arm64/v8",
158171
],
159172
)
160-
use_repo(oci, "busybox")
173+
use_repo(oci, "busybox", "busybox_linux_amd64", "busybox_linux_arm64_v8")

0 commit comments

Comments
 (0)