Fix compatibility with Bazel 6.5.0

bazelbuild · Aug 20, 2024 · 6b9c4a2 · 6b9c4a2
1 parent d3a2982
commit 6b9c4a2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/tests/bcr/go_mod/MODULE.bazel b/tests/bcr/go_mod/MODULE.bazel
@@ -14,6 +14,7 @@ local_path_override(
     path = "test_dep",
 )
 
+bazel_dep(name = "bazel_features", version = "1.14.0")
 bazel_dep(name = "protobuf", version = "23.1", repo_name = "my_protobuf")
 bazel_dep(name = "rules_go", version = "0.42.0", repo_name = "my_rules_go")
 bazel_dep(name = "rules_license", version = "0.0.8")

diff --git a/tests/bcr/go_mod/tests.bzl b/tests/bcr/go_mod/tests.bzl
@@ -1,3 +1,4 @@
+load("@bazel_features//:features.bzl", "bazel_features")
 load("@rules_license//rules:providers.bzl", "PackageInfo")
 load("@rules_testing//lib:analysis_test.bzl", "analysis_test", "test_suite")
 load("@rules_testing//lib:truth.bzl", "subjects")
@@ -14,6 +15,12 @@ def _test_package_info(name):
     )
 
 def _test_package_info_impl(env, target):
+    # The package_info functionality requires REPO.bazel support, which is only
+    # available in Bazel 7 and higher. Use this unrelated feature launched in
+    # Bazel 7 as a hacky signal to skip the test if the feature is not
+    # available.
+    if not bazel_features.proto.starlark_proto_info:
+        return
     env.expect.that_target(target).has_provider(PackageInfo)
     subject = env.expect.that_target(target).provider(PackageInfo)
     subject.package_name().equals("github.com/fmeum/dep_on_gazelle")