Merge branch 'main' into pre-commit-ci

.aspect/bazelrc/bazel8.bazelrc

@@ -0,0 +1 @@
+# No Bazel 8 specific flag presets yet.

.bcr/presubmit.yml

@@ -2,7 +2,10 @@ bcr_test_module:
   module_path: "e2e/smoke"
   matrix:
     platform: ["debian10", "macos", "ubuntu2004", "windows"]
-    bazel: ["7.x", "6.x"]
+    bazel:
+      - 6.x
+      - 7.x
+      - 8.x
   tasks:
     run_tests:
       name: "Run test module"

.github/workflows/ci.yaml

@@ -27,6 +27,7 @@ jobs:
           v=$(head -n 1 .bazelversion)
           m=${v::1}
           a=(
+            "major:8, version:\"last_rc\""
             "major:$m, version:\"$v\""
             "major:6, version:\"6.5.0\""
           )
@@ -71,6 +72,10 @@ jobs:
           # Root workspace is bzlmod-only
           - folder: .
             bzlmod: 0
+          # FIXME: root workspace not compatible with Bazel 8
+          - folder: .
+            bazel-version:
+              major: 8
           # Don't test MacOS and Windows against secondary bazel version to minimize minutes (billed at 10X and 2X respectively)
           # https://docs.github.com/en/billing/managing-billing-for-github-actions/about-billing-for-github-actions#included-storage-and-minutes
           - os: macos
@@ -79,7 +84,12 @@ jobs:
           - os: windows
             bazel-version:
               major: 6
-          # Don't run bzlmod tests with Bazel 6 to reduce the size of the test matrix
+          # Reduce size of the test matrix:
+          # Don't run workspace tests with Bazel 8
+          # Don't run bzlmod tests with Bazel 6
+          - bazel-version:
+              major: 8
+            bzlmod: 0
           - bazel-version:
               major: 6
             bzlmod: 1

.pre-commit-config.yaml

@@ -8,13 +8,13 @@ default_stages: [commit]
 repos:
   # Check formatting and lint for starlark code
   - repo: https://github.com/keith/pre-commit-buildifier
-    rev: 6.4.0
+    rev: 7.3.1
     hooks:
       - id: buildifier
       - id: buildifier-lint
   # Enforce that commit messages allow for later changelog generation
   - repo: https://github.com/commitizen-tools/commitizen
-    rev: v3.24.0
+    rev: v4.1.0
     hooks:
       # Requires that commitizen is already installed
       - id: commitizen
@@ -24,7 +24,7 @@ repos:
     hooks:
       - id: prettier
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v5.0.0
     hooks:
       - id: check-added-large-files
       - id: check-byte-order-marker
@@ -36,7 +36,7 @@ repos:
       - id: mixed-line-ending
       - id: trailing-whitespace
   - repo: https://github.com/crate-ci/typos
-    rev: v1.23.2
+    rev: v1.28.2
     hooks:
       - id: typos
         exclude: |

BUILD.bazel

@@ -121,6 +121,7 @@ assert_contains(
     name = "bazel_version_test",
     actual = ".bazelversion",
     expected = str(host.bazel_version),
+    target_compatible_with = [] if host.bazel_version.startswith("7") else ["@platforms//:incompatible"],
 )
 
 bzl_library(

MODULE.bazel

@@ -8,6 +8,7 @@ module(
 )
 
 # Lower-bounds (minimum) versions for direct runtime dependencies
+bazel_dep(name = "bazel_features", version = "1.9.0")
 bazel_dep(name = "bazel_skylib", version = "1.5.0")
 bazel_dep(name = "platforms", version = "0.0.10")
 
@@ -79,4 +80,3 @@ use_repo(host_platform, "host_platform")
 bazel_dep(name = "aspect_rules_lint", version = "1.0.0-rc10", dev_dependency = True)
 bazel_dep(name = "bazel_skylib_gazelle_plugin", version = "1.5.0", dev_dependency = True)
 bazel_dep(name = "buildifier_prebuilt", version = "6.4.0", dev_dependency = True)
-bazel_dep(name = "bazel_features", version = "0.2.0", dev_dependency = True)

lib/extensions.bzl

@@ -25,6 +25,7 @@ load(
     "register_yq_toolchains",
     "register_zstd_toolchains",
 )
+load("@bazel_features//:features.bzl", "bazel_features")
 load("//lib/private:extension_utils.bzl", "extension_utils")
 load("//lib/private:host_repo.bzl", "host_repo")
 
@@ -117,6 +118,11 @@ def _toolchains_extension_impl(mctx):
         get_version_fn = lambda attr: attr.core_version,
     )
 
+    if bazel_features.external_deps.extension_metadata_has_reproducible:
+        return mctx.extension_metadata(reproducible = True)
+
+    return mctx.extension_metadata()
+
 toolchains = module_extension(
     implementation = _toolchains_extension_impl,
     tag_classes = {