Skip to content

Commit 423d039

Browse files
mortenmjEdSchouten
authored andcommitted
Update dependencies
1 parent 9c1714b commit 423d039

File tree

12 files changed

+1485
-12172
lines changed

12 files changed

+1485
-12172
lines changed

.bazelversion

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

.github/workflows/master.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
},
3838
{
3939
"name": "Protobuf generation",
40-
"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"
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",
@@ -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_browser"
169169
},
170170
{
171171
"name": "windows_amd64: copy bb_browser",

.github/workflows/pull-requests.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
},
3838
{
3939
"name": "Protobuf generation",
40-
"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"
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",
@@ -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_browser"
8585
}
8686
]
8787
}

MODULE.bazel

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11
module(name = "com_github_buildbarn_bb_browser")
22

3-
bazel_dep(name = "aspect_rules_js", version = "2.0.1")
3+
bazel_dep(name = "aspect_rules_js", version = "2.2.0")
44
bazel_dep(name = "bazel_remote_apis", version = "0.0.0")
55
bazel_dep(name = "com_github_buildbarn_bb_remote_execution")
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 = "protobuf", version = "28.1")
10-
bazel_dep(name = "rules_go", version = "0.50.1")
8+
bazel_dep(name = "gazelle", version = "0.42.0")
9+
bazel_dep(name = "protobuf", version = "29.3")
10+
bazel_dep(name = "rules_go", version = "0.53.0")
1111
bazel_dep(name = "rules_jsonnet", version = "0.6.0")
12-
bazel_dep(name = "rules_proto", version = "6.0.2")
13-
bazel_dep(name = "toolchains_llvm", version = "1.1.2")
12+
bazel_dep(name = "rules_proto", version = "7.1.0")
13+
bazel_dep(name = "toolchains_llvm", version = "1.3.0")
1414

1515
git_override(
1616
module_name = "bazel_remote_apis",
17-
commit = "6777112ef7defa6705b1ebd2831d6c7efeb12ba2",
17+
commit = "7f922028fcfac63bdd8431e68de152d9e7a9e2a0",
1818
remote = "https://github.com/bazelbuild/remote-apis.git",
1919
)
2020

2121
git_override(
2222
module_name = "com_github_buildbarn_bb_remote_execution",
23-
commit = "853626adcafd25a948f90b05a251bfba9a0e236f",
23+
commit = "20a2e6d4cc7173e8fd215ecd54e416487ce146ab",
2424
remote = "https://github.com/buildbarn/bb-remote-execution.git",
2525
)
2626

2727
git_override(
2828
module_name = "com_github_buildbarn_bb_storage",
29-
commit = "8abbcfab01bcde294b20c2070baba9fd242bab7f",
29+
commit = "ed3a308b8e16acab47f874574806b97bf907f3f9",
3030
remote = "https://github.com/buildbarn/bb-storage.git",
3131
)
3232

@@ -46,6 +46,11 @@ git_override(
4646
remote = "https://github.com/marcohu/rules_antlr.git",
4747
)
4848

49+
single_version_override(
50+
module_name = "jsonnet",
51+
patches = ["//:patches/jsonnet/bazel-8.diff"],
52+
)
53+
4954
go_deps = use_extension("@gazelle//:extensions.bzl", "go_deps")
5055
go_deps.from_file(go_mod = "//:go.mod")
5156
use_repo(
@@ -64,10 +69,18 @@ use_repo(
6469
)
6570

6671
go_deps_dev = use_extension("@gazelle//:extensions.bzl", "go_deps", dev_dependency = True)
72+
go_deps_dev.gazelle_override(
73+
build_file_generation = "on",
74+
path = "github.com/cncf/xds/go",
75+
)
6776
go_deps_dev.module_override(
6877
patches = ["//:patches/com_github_buildkite_terminal_to_html/assets.diff"],
6978
path = "github.com/buildkite/terminal-to-html",
7079
)
80+
go_deps_dev.module_override(
81+
patches = ["@com_github_buildbarn_bb_storage//:patches/org_golang_x_sys/o-search.diff"],
82+
path = "golang.org/x/sys",
83+
)
7184
go_deps_dev.module_override(
7285
patches = ["@com_github_buildbarn_bb_storage//:patches/com_github_grpc_ecosystem_go_grpc_prometheus/client-metrics-prevent-handled-twice.diff"],
7386
path = "github.com/grpc-ecosystem/go-grpc-prometheus",

0 commit comments

Comments
 (0)