From 8b83e212f7df3e20dc901dec7d4e2f87e44a500f Mon Sep 17 00:00:00 2001 From: Alex Eagle Date: Wed, 2 Oct 2024 10:33:07 -0700 Subject: [PATCH] chore: disable a stardoc diff test on bazel 7 --- MODULE.bazel | 1 + docs/BUILD.bazel | 3 +++ docs/format.md | 4 ++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index ed6f3f66..235dc03f 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -12,6 +12,7 @@ bazel_dep(name = "aspect_bazel_lib", version = "2.7.7") # Minimum version needs 'chore: bump bazel-lib to 2.0 by @alexeagle in #1311' # to allow users on bazel-lib 2.0 bazel_dep(name = "aspect_rules_js", version = "1.40.0") +bazel_dep(name = "bazel_features", version = "1.18.0") bazel_dep(name = "bazel_skylib", version = "1.4.2") bazel_dep(name = "platforms", version = "0.0.7") bazel_dep(name = "rules_multirun", version = "0.9.0") diff --git a/docs/BUILD.bazel b/docs/BUILD.bazel index 0f7cc148..64084375 100644 --- a/docs/BUILD.bazel +++ b/docs/BUILD.bazel @@ -1,6 +1,7 @@ # This load statement must be in the docs/ package rather than anything users depend on # so that the dependency on stardoc doesn't leak to them. load("@aspect_bazel_lib//lib:docs.bzl", "stardoc_with_diff_test", "update_docs") +load("@bazel_features//private:util.bzl", "lt") stardoc_with_diff_test( name = "lint_test", @@ -35,6 +36,8 @@ stardoc_with_diff_test( stardoc_with_diff_test( name = "format", bzl_library_target = "//format:defs", + # See https://github.com/bazel-contrib/bazel_features/pull/75 + target_compatible_with = ["@platforms//:incompatible"] if lt("8.0.0-pre.20240911.1") else [], ) stardoc_with_diff_test( diff --git a/docs/format.md b/docs/format.md index 15ba0e02..3795a4c7 100644 --- a/docs/format.md +++ b/docs/format.md @@ -101,7 +101,7 @@ Some languages have dialects:
 load("@aspect_rules_lint//format:defs.bzl", "format_multirun")
 
-format_multirun(name, jobs, print_command, disable_git_attribute_checks, kwargs)
+format_multirun(name, jobs, print_command, disable_git_attribute_checks, **kwargs)
 
Create a [multirun] binary for the given languages. @@ -135,7 +135,7 @@ To check formatting with `bazel test`, use [format_test](#format_test) instead.
 load("@aspect_rules_lint//format:defs.bzl", "format_test")
 
-format_test(name, srcs, workspace, no_sandbox, disable_git_attribute_checks, tags, kwargs)
+format_test(name, srcs, workspace, no_sandbox, disable_git_attribute_checks, tags, **kwargs)
 
Create test for the given formatters.