Skip to content

Commit 02bcd4c

Browse files
EdSchoutenEdSchouten
committed
Upgrade all dependencies
Fixes: #39
1 parent 7da30cd commit 02bcd4c

10 files changed

Lines changed: 2088 additions & 1002 deletions

File tree

‎.bazelrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
common --workspace_status_command="bash tools/workspace-status.sh"
22
common --enable_platform_specific_config
3-
common --incompatible_enable_proto_toolchain_resolution
3+
common --@protobuf//bazel/toolchains:prefer_prebuilt_protoc
44
common --protocopt=--fatal_warnings
55

66
# Required to make protobuf compile on Windows

‎.bazelversion‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8.4.2
1+
9.0.0

‎.github/workflows/main.yaml‎

Lines changed: 91 additions & 24 deletions
Large diffs are not rendered by default.

‎.github/workflows/pull-requests.yaml‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,42 +21,47 @@
2121
{
2222
"if": "matrix.host.cross_compile || matrix.host.platform_name == 'linux_amd64'",
2323
"name": "linux_amd64: build${{ matrix.host.platform_name == 'linux_amd64' && ' and test' || '' }}",
24-
"run": "bazel ${{ matrix.host.platform_name == 'linux_amd64' && 'test --test_output=errors' || 'build' }} --platforms=@rules_go//go/toolchain:linux_amd64 //..."
24+
"run": "bazel ${{ matrix.host.platform_name == 'linux_amd64' && 'test --test_output=errors' || 'build --platforms=@com_github_buildbarn_bb_storage//tools/platforms:linux_amd64 --@bazel_tools//tools/test:incompatible_use_default_test_toolchain=False' }} //..."
25+
},
26+
{
27+
"if": "matrix.host.cross_compile || matrix.host.platform_name == 'linux_amd64_v3'",
28+
"name": "linux_amd64_v3: build${{ matrix.host.platform_name == 'linux_amd64_v3' && ' and test' || '' }}",
29+
"run": "bazel ${{ matrix.host.platform_name == 'linux_amd64_v3' && 'test --test_output=errors' || 'build --platforms=@com_github_buildbarn_bb_storage//tools/platforms:linux_amd64_v3 --@bazel_tools//tools/test:incompatible_use_default_test_toolchain=False' }} //..."
2530
},
2631
{
2732
"if": "matrix.host.cross_compile || matrix.host.platform_name == 'linux_386'",
2833
"name": "linux_386: build${{ matrix.host.platform_name == 'linux_amd64' && ' and test' || '' }}",
29-
"run": "bazel ${{ matrix.host.platform_name == 'linux_amd64' && 'test --test_output=errors' || 'build' }} --platforms=@rules_go//go/toolchain:linux_386 //..."
34+
"run": "bazel ${{ matrix.host.platform_name == 'linux_amd64' && 'test --test_output=errors' || 'build --platforms=@com_github_buildbarn_bb_storage//tools/platforms:linux_386 --@bazel_tools//tools/test:incompatible_use_default_test_toolchain=False' }} //..."
3035
},
3136
{
3237
"if": "matrix.host.cross_compile || matrix.host.platform_name == 'linux_arm'",
3338
"name": "linux_arm: build${{ matrix.host.platform_name == 'linux_arm' && ' and test' || '' }}",
34-
"run": "bazel ${{ matrix.host.platform_name == 'linux_arm' && 'test --test_output=errors' || 'build' }} --platforms=@rules_go//go/toolchain:linux_arm //..."
39+
"run": "bazel ${{ matrix.host.platform_name == 'linux_arm' && 'test --test_output=errors' || 'build --platforms=@com_github_buildbarn_bb_storage//tools/platforms:linux_arm --@bazel_tools//tools/test:incompatible_use_default_test_toolchain=False' }} //..."
3540
},
3641
{
3742
"if": "matrix.host.cross_compile || matrix.host.platform_name == 'linux_arm64'",
3843
"name": "linux_arm64: build${{ matrix.host.platform_name == 'linux_arm64' && ' and test' || '' }}",
39-
"run": "bazel ${{ matrix.host.platform_name == 'linux_arm64' && 'test --test_output=errors' || 'build' }} --platforms=@rules_go//go/toolchain:linux_arm64 //..."
44+
"run": "bazel ${{ matrix.host.platform_name == 'linux_arm64' && 'test --test_output=errors' || 'build --platforms=@com_github_buildbarn_bb_storage//tools/platforms:linux_arm64 --@bazel_tools//tools/test:incompatible_use_default_test_toolchain=False' }} //..."
4045
},
4146
{
4247
"if": "matrix.host.cross_compile || matrix.host.platform_name == 'darwin_amd64'",
4348
"name": "darwin_amd64: build${{ matrix.host.platform_name == 'darwin_amd64' && ' and test' || '' }}",
44-
"run": "bazel ${{ matrix.host.platform_name == 'darwin_amd64' && 'test --test_output=errors' || 'build' }} --platforms=@rules_go//go/toolchain:darwin_amd64 //..."
49+
"run": "bazel ${{ matrix.host.platform_name == 'darwin_amd64' && 'test --test_output=errors' || 'build --platforms=@com_github_buildbarn_bb_storage//tools/platforms:darwin_amd64 --@bazel_tools//tools/test:incompatible_use_default_test_toolchain=False' }} //..."
4550
},
4651
{
4752
"if": "matrix.host.cross_compile || matrix.host.platform_name == 'darwin_arm64'",
4853
"name": "darwin_arm64: build${{ matrix.host.platform_name == 'darwin_arm64' && ' and test' || '' }}",
49-
"run": "bazel ${{ matrix.host.platform_name == 'darwin_arm64' && 'test --test_output=errors' || 'build' }} --platforms=@rules_go//go/toolchain:darwin_arm64 //..."
54+
"run": "bazel ${{ matrix.host.platform_name == 'darwin_arm64' && 'test --test_output=errors' || 'build --platforms=@com_github_buildbarn_bb_storage//tools/platforms:darwin_arm64 --@bazel_tools//tools/test:incompatible_use_default_test_toolchain=False' }} //..."
5055
},
5156
{
5257
"if": "matrix.host.cross_compile || matrix.host.platform_name == 'freebsd_amd64'",
5358
"name": "freebsd_amd64: build${{ matrix.host.platform_name == 'freebsd_amd64' && ' and test' || '' }}",
54-
"run": "bazel ${{ matrix.host.platform_name == 'freebsd_amd64' && 'test --test_output=errors' || 'build' }} --platforms=@rules_go//go/toolchain:freebsd_amd64 //..."
59+
"run": "bazel ${{ matrix.host.platform_name == 'freebsd_amd64' && 'test --test_output=errors' || 'build --platforms=@com_github_buildbarn_bb_storage//tools/platforms:freebsd_amd64 --@bazel_tools//tools/test:incompatible_use_default_test_toolchain=False' }} //..."
5560
},
5661
{
5762
"if": "matrix.host.cross_compile || matrix.host.platform_name == 'windows_amd64'",
5863
"name": "windows_amd64: build${{ matrix.host.platform_name == 'windows_amd64' && ' and test' || '' }}",
59-
"run": "bazel ${{ matrix.host.platform_name == 'windows_amd64' && 'test --test_output=errors' || 'build' }} --platforms=@rules_go//go/toolchain:windows_amd64 //..."
64+
"run": "bazel ${{ matrix.host.platform_name == 'windows_amd64' && 'test --test_output=errors' || 'build --platforms=@com_github_buildbarn_bb_storage//tools/platforms:windows_amd64 --@bazel_tools//tools/test:incompatible_use_default_test_toolchain=False' }} //..."
6065
}
6166
],
6267
"strategy": {

‎MODULE.bazel‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
11
module(name = "com_github_buildbarn_bb_clientd")
22

3-
bazel_dep(name = "aspect_bazel_lib", version = "2.21.2")
3+
bazel_dep(name = "aspect_bazel_lib", version = "2.22.5")
44
bazel_dep(name = "bazel_remote_apis", version = "0.0.0")
5+
bazel_dep(name = "cel-spec", version = "0.25.1")
56
bazel_dep(name = "com_github_buildbarn_bb_remote_execution")
67
bazel_dep(name = "com_github_buildbarn_bb_storage")
78
bazel_dep(name = "com_github_buildbarn_go_xdr")
8-
bazel_dep(name = "gazelle", version = "0.46.0")
9+
bazel_dep(name = "gazelle", version = "0.47.0")
910
bazel_dep(name = "jsonnet_go", version = "0.21.0")
1011
bazel_dep(name = "platforms", version = "1.0.0")
11-
bazel_dep(name = "toolchains_protoc", version = "0.5.0") # must come BEFORE protobuf so the toolchain registration wins
12-
bazel_dep(name = "protobuf", version = "31.1")
12+
bazel_dep(name = "protobuf", version = "33.5")
1313
bazel_dep(name = "rules_jsonnet", version = "0.7.2")
14-
bazel_dep(name = "rules_go", version = "0.58.3")
15-
bazel_dep(name = "rules_pkg", version = "1.1.0")
14+
bazel_dep(name = "rules_go", version = "0.60.0")
15+
bazel_dep(name = "rules_pkg", version = "1.2.0")
1616
bazel_dep(name = "rules_proto", version = "7.1.0")
17-
bazel_dep(name = "toolchains_llvm", version = "1.5.0")
17+
bazel_dep(name = "toolchains_llvm", version = "1.6.0")
1818

1919
git_override(
2020
module_name = "bazel_remote_apis",
21-
commit = "824e1ba94b2db15f68ceff97ae6da503fbc26985",
21+
commit = "9e084d0e43e717128ee72b5be584a7ba33e8006b",
2222
remote = "https://github.com/bazelbuild/remote-apis.git",
2323
)
2424

2525
git_override(
2626
module_name = "com_github_buildbarn_bb_remote_execution",
27-
commit = "9c26bb068e2a2a7b3e68e442314a7d7573203a69",
27+
commit = "c453f856a032db62a4a99332b71fa67105b9cc9c",
2828
remote = "https://github.com/buildbarn/bb-remote-execution.git",
2929
)
3030

3131
git_override(
3232
module_name = "com_github_buildbarn_bb_storage",
33-
commit = "82740a3e08c3e545f1ada78dcafc359c4414ecaa",
33+
commit = "33893b3cf43dc7927e2a388200a55f54b3979e82",
3434
remote = "https://github.com/buildbarn/bb-storage.git",
3535
)
3636

@@ -40,6 +40,11 @@ git_override(
4040
remote = "https://github.com/buildbarn/go-xdr.git",
4141
)
4242

43+
single_version_override(
44+
module_name = "jsonnet_go",
45+
patches = ["//:patches/jsonnet_go/bazel-9.diff"],
46+
)
47+
4348
git_override(
4449
module_name = "rules_antlr",
4550
commit = "89a29cca479363a5aee53e203719510bdc6be6ff",
@@ -55,9 +60,8 @@ single_version_override(
5560
patches = ["//:patches/toolchains_llvm/non-root.diff"],
5661
)
5762

58-
# Match protobuf above, until it ships a pre-built binary toolchain itself
59-
protoc = use_extension("@toolchains_protoc//protoc:extensions.bzl", "protoc")
60-
protoc.toolchain(version = "v31.1")
63+
go_sdk = use_extension("@rules_go//go:extensions.bzl", "go_sdk")
64+
go_sdk.from_file(go_mod = "//:go.mod")
6165

6266
go_deps = use_extension("@gazelle//:extensions.bzl", "go_deps")
6367
go_deps.from_file(go_mod = "//:go.mod")

0 commit comments

Comments
 (0)