Skip to content

Commit e8f045a

Browse files
committed
Fix for bazel9
1 parent 6df1519 commit e8f045a

10 files changed

Lines changed: 21 additions & 12 deletions

File tree

.bazelversion

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

.bcr/presubmit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ bcr_test_module:
22
module_path: "tests"
33
matrix:
44
platform: ["debian10", "macos", "ubuntu2004", "windows"]
5-
bazel: [7.x, 8.x]
5+
bazel: [7.x, 8.x, rolling]
66
tasks:
77
run_tests:
88
name: "Run tests"

BUILD.bazel

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
load("@bazel_lib//:bzl_library.bzl", "bzl_library")
22
load("@bazel_skylib//rules:common_settings.bzl", "bool_flag", "string_flag")
3+
load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
4+
load("@rules_cc//cc:cc_test.bzl", "cc_test")
35

46
# gazelle:prefix rules_itest
57
# gazelle:map_kind bzl_library bzl_library @bazel_lib//:bzl_library.bzl

MODULE.bazel

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ module(
66

77
bazel_dep(name = "bazel_lib", version = "3.0.0")
88
bazel_dep(name = "bazel_skylib", version = "1.8.2")
9-
bazel_dep(name = "rules_go", version = "0.52.0")
9+
bazel_dep(name = "rules_cc", version = "0.1.5")
10+
bazel_dep(name = "rules_go", version = "0.59.0")
1011
bazel_dep(name = "gazelle", version = "0.41.0")
1112
bazel_dep(name = "platforms", version = "0.0.11")
1213

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ module rules_itest
33
go 1.22.0
44

55
require (
6-
github.com/bazelbuild/rules_go v0.52.0
7-
golang.org/x/sys v0.25.0
6+
github.com/bazelbuild/rules_go v0.59.0
7+
golang.org/x/sys v0.30.0
88
)

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
github.com/bazelbuild/rules_go v0.52.0 h1:+ozpngVAW67pCAwfhepaXSSrG3yHcj8K9hNAxSYBno4=
2-
github.com/bazelbuild/rules_go v0.52.0/go.mod h1:M+YrupNArA7OiTlv++rFUgQ6Sm+ZXbQ5HPUj0cGa0us=
3-
golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
4-
golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
1+
github.com/bazelbuild/rules_go v0.59.0 h1:RLhOwYIqeMgBpKelHEWTfIPjA37so3oa/rX+/qqq/P4=
2+
github.com/bazelbuild/rules_go v0.59.0/go.mod h1:Pn30cb4M513fe2rQ6GiJ3q8QyrRsgC7zhuDvi50Lw4Y=
3+
golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
4+
golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=

tests/.bazelrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
import ../.bazelrc
22
common --noenable_runfiles
33
common --@rules_go//go/config:pure
4+
5+
# TODO: Remove once transitives are fixed
6+
common --incompatible_autoload_externally=+@rules_cc

tests/MODULE.bazel

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@ local_path_override(
55
)
66

77
bazel_dep(name = "aspect_bazel_lib", version = "2.21.2")
8-
bazel_dep(name = "aspect_rules_js", version = "2.7.0")
8+
bazel_dep(name = "aspect_rules_js", version = "2.8.2")
9+
bazel_dep(name = "rules_nodejs", version = "6.6.2") # only to bump to non-broken version for bazel 9
910
bazel_dep(name = "bazel_lib", version = "3.0.0")
1011
bazel_dep(name = "bazel_skylib", version = "1.8.2")
11-
bazel_dep(name = "rules_go", version = "0.58.3")
12+
bazel_dep(name = "rules_cc", version = "0.2.14")
13+
bazel_dep(name = "rules_go", version = "0.59.0")
1214
bazel_dep(name = "rules_shell", version = "0.6.1")
1315
bazel_dep(name = "gazelle", version = "0.46.0")
1416
bazel_dep(name = "platforms", version = "1.0.0")

tests/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ module rules_itest/tests
33
go 1.22.0
44

55
require (
6-
github.com/bazelbuild/rules_go v0.58.3
6+
github.com/bazelbuild/rules_go v0.59.0
77
golang.org/x/sys v0.30.0
88
)

tests/test_env/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
12
load("@rules_go//go:def.bzl", "go_test")
23
load("@rules_itest//:itest.bzl", "itest_task", "service_test")
34
load("@rules_shell//shell:sh_binary.bzl", "sh_binary")

0 commit comments

Comments
 (0)