diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 1887c35f..760396b8 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -18,11 +18,18 @@ concurrency: jobs: bazel-test: - uses: bazel-contrib/.github/.github/workflows/bazel.yaml@bazel8 + uses: bazel-contrib/.github/.github/workflows/bazel.yaml@v6 with: folders: '[".", "example"]' # Don't try for Windows support yet. exclude_windows: true + # Root module is bzlmod-only and uses newer stardoc that requires Bazel 7. + # Example uses incompatible_enable_proto_toolchain_resolution + exclude: | + [ + {"bzlmodEnabled": false, "folder": "."}, + {"bazelversion": "6.4.0"} + ] integration-test: runs-on: ubuntu-latest diff --git a/MODULE.bazel b/MODULE.bazel index 235dc03f..ed6f3f66 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -12,7 +12,6 @@ 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 64084375..0f7cc148 100644 --- a/docs/BUILD.bazel +++ b/docs/BUILD.bazel @@ -1,7 +1,6 @@ # 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", @@ -36,8 +35,6 @@ 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 3795a4c7..15ba0e02 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.