Skip to content

Commit a750e60

Browse files
EdSchoutenEdSchouten
authored
Upgrade to Bazel 9.0.0rc1 (#203)
We managed to fix up all regressions that we discovered on the bb-storage, such as missing load() directives in @bazel_remote_apis. Upgrading bb-remote-execution should therefore be pretty easy now.
1 parent b0dbe60 commit a750e60

35 files changed

+350
-562
lines changed

‎.bazelversion‎

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

‎.github/workflows/main.yaml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
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=@rules_go//go/toolchain:linux_amd64 --@bazel_tools//tools/test:incompatible_use_default_test_toolchain=False' }} //..."
2525
},
2626
{
2727
"if": "matrix.host.upload",
@@ -124,7 +124,7 @@
124124
{
125125
"if": "matrix.host.cross_compile || matrix.host.platform_name == 'linux_386'",
126126
"name": "linux_386: build${{ matrix.host.platform_name == 'linux_amd64' && ' and test' || '' }}",
127-
"run": "bazel ${{ matrix.host.platform_name == 'linux_amd64' && 'test --test_output=errors' || 'build' }} --platforms=@rules_go//go/toolchain:linux_386 //..."
127+
"run": "bazel ${{ matrix.host.platform_name == 'linux_amd64' && 'test --test_output=errors' || 'build --platforms=@rules_go//go/toolchain:linux_386 --@bazel_tools//tools/test:incompatible_use_default_test_toolchain=False' }} //..."
128128
},
129129
{
130130
"if": "matrix.host.upload",
@@ -227,7 +227,7 @@
227227
{
228228
"if": "matrix.host.cross_compile || matrix.host.platform_name == 'linux_arm'",
229229
"name": "linux_arm: build${{ matrix.host.platform_name == 'linux_arm' && ' and test' || '' }}",
230-
"run": "bazel ${{ matrix.host.platform_name == 'linux_arm' && 'test --test_output=errors' || 'build' }} --platforms=@rules_go//go/toolchain:linux_arm //..."
230+
"run": "bazel ${{ matrix.host.platform_name == 'linux_arm' && 'test --test_output=errors' || 'build --platforms=@rules_go//go/toolchain:linux_arm --@bazel_tools//tools/test:incompatible_use_default_test_toolchain=False' }} //..."
231231
},
232232
{
233233
"if": "matrix.host.upload",
@@ -330,7 +330,7 @@
330330
{
331331
"if": "matrix.host.cross_compile || matrix.host.platform_name == 'linux_arm64'",
332332
"name": "linux_arm64: build${{ matrix.host.platform_name == 'linux_arm64' && ' and test' || '' }}",
333-
"run": "bazel ${{ matrix.host.platform_name == 'linux_arm64' && 'test --test_output=errors' || 'build' }} --platforms=@rules_go//go/toolchain:linux_arm64 //..."
333+
"run": "bazel ${{ matrix.host.platform_name == 'linux_arm64' && 'test --test_output=errors' || 'build --platforms=@rules_go//go/toolchain:linux_arm64 --@bazel_tools//tools/test:incompatible_use_default_test_toolchain=False' }} //..."
334334
},
335335
{
336336
"if": "matrix.host.upload",
@@ -433,7 +433,7 @@
433433
{
434434
"if": "matrix.host.cross_compile || matrix.host.platform_name == 'darwin_amd64'",
435435
"name": "darwin_amd64: build${{ matrix.host.platform_name == 'darwin_amd64' && ' and test' || '' }}",
436-
"run": "bazel ${{ matrix.host.platform_name == 'darwin_amd64' && 'test --test_output=errors' || 'build' }} --platforms=@rules_go//go/toolchain:darwin_amd64 //..."
436+
"run": "bazel ${{ matrix.host.platform_name == 'darwin_amd64' && 'test --test_output=errors' || 'build --platforms=@rules_go//go/toolchain:darwin_amd64 --@bazel_tools//tools/test:incompatible_use_default_test_toolchain=False' }} //..."
437437
},
438438
{
439439
"if": "matrix.host.upload",
@@ -536,7 +536,7 @@
536536
{
537537
"if": "matrix.host.cross_compile || matrix.host.platform_name == 'darwin_arm64'",
538538
"name": "darwin_arm64: build${{ matrix.host.platform_name == 'darwin_arm64' && ' and test' || '' }}",
539-
"run": "bazel ${{ matrix.host.platform_name == 'darwin_arm64' && 'test --test_output=errors' || 'build' }} --platforms=@rules_go//go/toolchain:darwin_arm64 //..."
539+
"run": "bazel ${{ matrix.host.platform_name == 'darwin_arm64' && 'test --test_output=errors' || 'build --platforms=@rules_go//go/toolchain:darwin_arm64 --@bazel_tools//tools/test:incompatible_use_default_test_toolchain=False' }} //..."
540540
},
541541
{
542542
"if": "matrix.host.upload",
@@ -639,7 +639,7 @@
639639
{
640640
"if": "matrix.host.cross_compile || matrix.host.platform_name == 'freebsd_amd64'",
641641
"name": "freebsd_amd64: build${{ matrix.host.platform_name == 'freebsd_amd64' && ' and test' || '' }}",
642-
"run": "bazel ${{ matrix.host.platform_name == 'freebsd_amd64' && 'test --test_output=errors' || 'build' }} --platforms=@rules_go//go/toolchain:freebsd_amd64 //..."
642+
"run": "bazel ${{ matrix.host.platform_name == 'freebsd_amd64' && 'test --test_output=errors' || 'build --platforms=@rules_go//go/toolchain:freebsd_amd64 --@bazel_tools//tools/test:incompatible_use_default_test_toolchain=False' }} //..."
643643
},
644644
{
645645
"if": "matrix.host.upload",
@@ -742,7 +742,7 @@
742742
{
743743
"if": "matrix.host.cross_compile || matrix.host.platform_name == 'windows_amd64'",
744744
"name": "windows_amd64: build${{ matrix.host.platform_name == 'windows_amd64' && ' and test' || '' }}",
745-
"run": "bazel ${{ matrix.host.platform_name == 'windows_amd64' && 'test --test_output=errors' || 'build' }} --platforms=@rules_go//go/toolchain:windows_amd64 //..."
745+
"run": "bazel ${{ matrix.host.platform_name == 'windows_amd64' && 'test --test_output=errors' || 'build --platforms=@rules_go//go/toolchain:windows_amd64 --@bazel_tools//tools/test:incompatible_use_default_test_toolchain=False' }} //..."
746746
},
747747
{
748748
"if": "matrix.host.upload",
@@ -850,7 +850,7 @@
850850
{
851851
"if": "matrix.host.platform_name == 'windows_amd64'",
852852
"name": "Execute WinFSP Integration Tests",
853-
"run": "bazel test --platforms=@rules_go//go/toolchain:windows_amd64 //pkg/filesystem/virtual/winfsp:file_system_integration_test"
853+
"run": "bazel test //pkg/filesystem/virtual/winfsp:file_system_integration_test"
854854
},
855855
{
856856
"env": {

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,42 +21,42 @@
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=@rules_go//go/toolchain:linux_amd64 --@bazel_tools//tools/test:incompatible_use_default_test_toolchain=False' }} //..."
2525
},
2626
{
2727
"if": "matrix.host.cross_compile || matrix.host.platform_name == 'linux_386'",
2828
"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 //..."
29+
"run": "bazel ${{ matrix.host.platform_name == 'linux_amd64' && 'test --test_output=errors' || 'build --platforms=@rules_go//go/toolchain:linux_386 --@bazel_tools//tools/test:incompatible_use_default_test_toolchain=False' }} //..."
3030
},
3131
{
3232
"if": "matrix.host.cross_compile || matrix.host.platform_name == 'linux_arm'",
3333
"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 //..."
34+
"run": "bazel ${{ matrix.host.platform_name == 'linux_arm' && 'test --test_output=errors' || 'build --platforms=@rules_go//go/toolchain:linux_arm --@bazel_tools//tools/test:incompatible_use_default_test_toolchain=False' }} //..."
3535
},
3636
{
3737
"if": "matrix.host.cross_compile || matrix.host.platform_name == 'linux_arm64'",
3838
"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 //..."
39+
"run": "bazel ${{ matrix.host.platform_name == 'linux_arm64' && 'test --test_output=errors' || 'build --platforms=@rules_go//go/toolchain:linux_arm64 --@bazel_tools//tools/test:incompatible_use_default_test_toolchain=False' }} //..."
4040
},
4141
{
4242
"if": "matrix.host.cross_compile || matrix.host.platform_name == 'darwin_amd64'",
4343
"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 //..."
44+
"run": "bazel ${{ matrix.host.platform_name == 'darwin_amd64' && 'test --test_output=errors' || 'build --platforms=@rules_go//go/toolchain:darwin_amd64 --@bazel_tools//tools/test:incompatible_use_default_test_toolchain=False' }} //..."
4545
},
4646
{
4747
"if": "matrix.host.cross_compile || matrix.host.platform_name == 'darwin_arm64'",
4848
"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 //..."
49+
"run": "bazel ${{ matrix.host.platform_name == 'darwin_arm64' && 'test --test_output=errors' || 'build --platforms=@rules_go//go/toolchain:darwin_arm64 --@bazel_tools//tools/test:incompatible_use_default_test_toolchain=False' }} //..."
5050
},
5151
{
5252
"if": "matrix.host.cross_compile || matrix.host.platform_name == 'freebsd_amd64'",
5353
"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 //..."
54+
"run": "bazel ${{ matrix.host.platform_name == 'freebsd_amd64' && 'test --test_output=errors' || 'build --platforms=@rules_go//go/toolchain:freebsd_amd64 --@bazel_tools//tools/test:incompatible_use_default_test_toolchain=False' }} //..."
5555
},
5656
{
5757
"if": "matrix.host.cross_compile || matrix.host.platform_name == 'windows_amd64'",
5858
"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 //..."
59+
"run": "bazel ${{ matrix.host.platform_name == 'windows_amd64' && 'test --test_output=errors' || 'build --platforms=@rules_go//go/toolchain:windows_amd64 --@bazel_tools//tools/test:incompatible_use_default_test_toolchain=False' }} //..."
6060
},
6161
{
6262
"if": "matrix.host.platform_name == 'windows_amd64'",
@@ -66,7 +66,7 @@
6666
{
6767
"if": "matrix.host.platform_name == 'windows_amd64'",
6868
"name": "Execute WinFSP Integration Tests",
69-
"run": "bazel test --platforms=@rules_go//go/toolchain:windows_amd64 //pkg/filesystem/virtual/winfsp:file_system_integration_test"
69+
"run": "bazel test //pkg/filesystem/virtual/winfsp:file_system_integration_test"
7070
}
7171
],
7272
"strategy": {

‎MODULE.bazel‎

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

33
bazel_dep(name = "aspect_bazel_lib", version = "2.21.2")
4-
bazel_dep(name = "aspect_rules_js", version = "2.6.0")
4+
bazel_dep(name = "aspect_rules_js", version = "2.8.1")
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.45.0")
9-
bazel_dep(name = "googleapis", version = "0.0.0-20250826-a92cee39")
8+
bazel_dep(name = "gazelle", version = "0.47.0")
9+
bazel_dep(name = "googleapis", version = "0.0.0-20251104-53af3b72")
1010
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")
13-
bazel_dep(name = "rules_go", version = "0.57.0")
11+
bazel_dep(name = "toolchains_protoc", version = "0.6.0") # must come BEFORE protobuf so the toolchain registration wins
12+
bazel_dep(name = "protobuf", version = "33.0")
13+
bazel_dep(name = "rules_go", version = "0.59.0")
1414
bazel_dep(name = "rules_jsonnet", version = "0.7.2")
1515
bazel_dep(name = "rules_oci", version = "2.2.6")
1616
bazel_dep(name = "rules_pkg", version = "1.1.0")
@@ -19,13 +19,13 @@ bazel_dep(name = "toolchains_llvm", version = "1.5.0")
1919

2020
git_override(
2121
module_name = "bazel_remote_apis",
22-
commit = "824e1ba94b2db15f68ceff97ae6da503fbc26985",
22+
commit = "3860ca2d3e559d487b7d4ad07aa2a4a08d7624da",
2323
remote = "https://github.com/bazelbuild/remote-apis.git",
2424
)
2525

2626
git_override(
2727
module_name = "com_github_buildbarn_bb_storage",
28-
commit = "7199df9e3c26961561ee32953216d7058f274b44",
28+
commit = "faf8fe60ecd0453a128383dee1a270ac6c161c3c",
2929
remote = "https://github.com/buildbarn/bb-storage.git",
3030
)
3131

@@ -57,7 +57,7 @@ single_version_override(
5757

5858
# Match protobuf above, until it ships a pre-built binary toolchain itself
5959
protoc = use_extension("@toolchains_protoc//protoc:extensions.bzl", "protoc")
60-
protoc.toolchain(version = "v31.1")
60+
protoc.toolchain(version = "v33.0")
6161

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

0 commit comments

Comments
 (0)