chore: test on bazel 9 (#3880)

alexeagle · web-flow · commit 7a710426e108 · 2026-01-14T11:56:08.000-08:00
Requires adapting to the Bazel 9 breaking changes (finally)
diff --git a/.aspect/workflows/config.yaml b/.aspect/workflows/config.yaml
@@ -1,5 +1,21 @@
+# Test the root workspace using "dev dependencies" on Linux only, and with the version in .bazelversion.
+# Look in /.github/workflows/ci.yaml for test matrix on other OS
 # See https://docs.aspect.build/workflows/configuration
 tasks:
   - test:
+      name: Bazel 7
+      id: bazel-7
+      env:
+        USE_BAZEL_VERSION: 7.x
+  - test:
+      name: Bazel 8
+      id: bazel-8
+      env:
+        USE_BAZEL_VERSION: 8.x
+  - test:
+      name: Bazel 9
+      id: bazel-9
+      env:
+        USE_BAZEL_VERSION: 9.*
 notifications:
   github: {}
diff --git a/.bcr/presubmit.yml b/.bcr/presubmit.yml
@@ -1,7 +1,7 @@
 bcr_test_module:
   module_path: "e2e/smoke"
   matrix:
-    bazel: ["7.x", "8.x", "rolling"]
+    bazel: ["7.x", "8.x", "9.*"]
     platform: ["debian11", "macos", "ubuntu2204", "windows"]
   tasks:
     run_tests:
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -1,32 +1,30 @@
 name: CI
-
-# Controls when the action will run.
 on:
   push:
     branches: [main]
   pull_request:
     branches: [main]
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
-
-concurrency:
-  # Cancel previous actions from the same PR or branch except 'main' branch.
-  # See https://docs.github.com/en/actions/using-jobs/using-concurrency and https://docs.github.com/en/actions/learn-github-actions/contexts for more info.
-  group: concurrency-group::${{ github.workflow }}::${{ github.event.pull_request.number > 0 && format('pr-{0}', github.event.pull_request.number) || github.ref_name }}${{ github.ref_name == 'main' && format('::{0}', github.run_id) || ''}}
-  cancel-in-progress: ${{ github.ref_name != 'main' }}
-
+permissions:
+  contents: read
 jobs:
-  test:
-    uses: bazel-contrib/.github/.github/workflows/bazel.yaml@v7.2.3
-    with:
-      folders: '[".", "e2e/headers", "e2e/smoke", "e2e/nodejs_host", "e2e/conflicting_toolchains"]'
-      # stardoc generated docs fail on diff_test with Bazel 6.4.0 so don't test against it in root repository
-      exclude: |
-        [
-          {"bazelversion": "7.3.1", "os": "ubuntu-latest", folder: "."},
-          {"bazelversion": "6.4.0", "os": "macos-latest"},
-          {"bazelversion": "6.4.0", "os": "windows-latest"},
-          {"bazelversion": "6.4.0", folder: "."},
-          {"bazelversion": "6.4.0", bzlmodEnabled: true},
-          {folder: "e2e/conflicting_toolchains", bzlmodEnabled: false}
-        ]
+  e2e-tests:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+        bazel:
+          - 9.*
+        folder:
+          - e2e/headers
+          - e2e/smoke
+          - e2e/nodejs_host
+          - e2e/conflicting_toolchains
+    steps:
+      - uses: actions/checkout@v5
+      - uses: bazel-contrib/setup-bazel@0.18.0
+      - run: bazel test ...
+        env:
+          USE_BAZEL_VERSION: ${{ matrix.bazel }}
+        working-directory: ${{ matrix.folder }}
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -6,9 +6,11 @@ module(
 )
 
 # Lower-bounds (minimum) versions for direct runtime dependencies
-bazel_dep(name = "bazel_lib", version = "3.0.0-beta.1")
+bazel_dep(name = "bazel_lib", version = "3.0.0")
+bazel_dep(name = "bazel_features", version = "1.39.0")
 bazel_dep(name = "bazel_skylib", version = "1.4.1")
-bazel_dep(name = "platforms", version = "0.0.5")
+bazel_dep(name = "platforms", version = "1.0.0")
+bazel_dep(name = "rules_cc", version = "0.2.16")  # to expose headers
 
 # workaround for https://github.com/bazelbuild/bazel/issues/25124
 bazel_dep(name = "zlib", version = "1.3.1.bcr.6", dev_dependency = True)
@@ -56,3 +58,25 @@ register_toolchains("@nodejs_toolchains//:windows_amd64_toolchain")
 register_toolchains("@nodejs_toolchains//:windows_arm64_runtime_toolchain")
 
 register_toolchains("@nodejs_toolchains//:windows_arm64_toolchain")
+
+############
+# Dev dependencies
+bazel_dep(name = "buildifier_prebuilt", version = "8.2.1.1", dev_dependency = True)
+
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+
+http_archive(
+    name = "npm_typescript",
+    build_file = "//:external/typescript.BUILD",
+    dev_dependency = True,
+    sha256 = "6e2faae079c9047aa921e8a307f0cec0da4dc4853e20bb31d18acc678f5bf505",
+    urls = ["https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz"],
+)
+
+http_archive(
+    name = "npm_types_node",
+    build_file = "//:external/types_node.BUILD",
+    dev_dependency = True,
+    sha256 = "6ef16adadc11a80601c023e1271887425c5c5c1867266d35493c7e92d7cc00fa",
+    urls = ["https://registry.npmjs.org/@types/node/-/node-16.18.23.tgz"],
+)
diff --git a/WORKSPACE b/WORKSPACE
@@ -16,6 +16,17 @@ workspace(name = "rules_nodejs")
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
+http_archive(
+    name = "bazel_features",
+    sha256 = "5ab1a90d09fd74555e0df22809ad589627ddff263cff82535815aa80ca3e3562",
+    strip_prefix = "bazel_features-1.39.0",
+    url = "https://github.com/bazel-contrib/bazel_features/releases/download/v1.39.0/bazel_features-v1.39.0.tar.gz",
+)
+
+load("@bazel_features//:deps.bzl", "bazel_features_deps")
+
+bazel_features_deps()
+
 #
 # Install rules_nodejs dev dependencies
 #
diff --git a/e2e/conflicting_toolchains/.bazelversion b/e2e/conflicting_toolchains/.bazelversion
diff --git a/e2e/conflicting_toolchains/BUILD.bazel b/e2e/conflicting_toolchains/BUILD.bazel
@@ -1,5 +1,6 @@
 # this is set up to make bazel test //... pass
 load("@bazel_skylib//rules:write_file.bzl", "write_file")
+load("@rules_shell//shell:sh_test.bzl", "sh_test")
 
 write_file(
     name = "empty",
diff --git a/e2e/conflicting_toolchains/MODULE.bazel b/e2e/conflicting_toolchains/MODULE.bazel
@@ -1,2 +1,2 @@
-# this is set up to make bazel test //... pass
-bazel_dep(name = "bazel_skylib", version = "1.7.1", dev_dependency = True)
+bazel_dep(name = "bazel_skylib", version = "1.7.1")
+bazel_dep(name = "rules_shell", version = "0.6.1")
diff --git a/e2e/conflicting_toolchains/test_include_headers/.bazelversion b/e2e/conflicting_toolchains/test_include_headers/.bazelversion
diff --git a/e2e/conflicting_toolchains/test_include_headers/MODULE.bazel b/e2e/conflicting_toolchains/test_include_headers/MODULE.bazel
@@ -1,10 +1,10 @@
-bazel_dep(name = "rules_nodejs", version = "0.0.0", dev_dependency = True)
+bazel_dep(name = "rules_nodejs")
 local_path_override(
     module_name = "rules_nodejs",
     path = "../../..",
 )
 
-node = use_extension("@rules_nodejs//nodejs:extensions.bzl", "node", dev_dependency = True)
+node = use_extension("@rules_nodejs//nodejs:extensions.bzl", "node")
 node.toolchain(
     name = "mynode",
 )
diff --git a/e2e/conflicting_toolchains/test_node_urls/.bazelversion b/e2e/conflicting_toolchains/test_node_urls/.bazelversion
diff --git a/e2e/conflicting_toolchains/test_node_urls/MODULE.bazel b/e2e/conflicting_toolchains/test_node_urls/MODULE.bazel
@@ -1,10 +1,10 @@
-bazel_dep(name = "rules_nodejs", version = "0.0.0", dev_dependency = True)
+bazel_dep(name = "rules_nodejs")
 local_path_override(
     module_name = "rules_nodejs",
     path = "../../..",
 )
 
-node = use_extension("@rules_nodejs//nodejs:extensions.bzl", "node", dev_dependency = True)
+node = use_extension("@rules_nodejs//nodejs:extensions.bzl", "node")
 node.toolchain(
     name = "mynode",
 )
diff --git a/e2e/conflicting_toolchains/test_node_version/.bazelversion b/e2e/conflicting_toolchains/test_node_version/.bazelversion
diff --git a/e2e/conflicting_toolchains/test_node_version/MODULE.bazel b/e2e/conflicting_toolchains/test_node_version/MODULE.bazel
@@ -1,10 +1,10 @@
-bazel_dep(name = "rules_nodejs", version = "0.0.0", dev_dependency = True)
+bazel_dep(name = "rules_nodejs")
 local_path_override(
     module_name = "rules_nodejs",
     path = "../../..",
 )
 
-node = use_extension("@rules_nodejs//nodejs:extensions.bzl", "node", dev_dependency = True)
+node = use_extension("@rules_nodejs//nodejs:extensions.bzl", "node")
 node.toolchain(
     name = "mynode",
 )
diff --git a/e2e/conflicting_toolchains/test_node_version_from_nvmrc/.bazelversion b/e2e/conflicting_toolchains/test_node_version_from_nvmrc/.bazelversion
diff --git a/e2e/conflicting_toolchains/test_node_version_from_nvmrc/MODULE.bazel b/e2e/conflicting_toolchains/test_node_version_from_nvmrc/MODULE.bazel
@@ -1,10 +1,10 @@
-bazel_dep(name = "rules_nodejs", version = "0.0.0", dev_dependency = True)
+bazel_dep(name = "rules_nodejs")
 local_path_override(
     module_name = "rules_nodejs",
     path = "../../..",
 )
 
-node = use_extension("@rules_nodejs//nodejs:extensions.bzl", "node", dev_dependency = True)
+node = use_extension("@rules_nodejs//nodejs:extensions.bzl", "node")
 node.toolchain(
     name = "mynode",
 )
diff --git a/e2e/headers/.bazelversion b/e2e/headers/.bazelversion
diff --git a/e2e/headers/BUILD.bazel b/e2e/headers/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_cc//cc:defs.bzl", "cc_test")
+
 cc_test(
     name = "using_headers_test",
     srcs = ["using_headers.cc"],
diff --git a/e2e/headers/MODULE.bazel b/e2e/headers/MODULE.bazel
@@ -1,10 +1,11 @@
-bazel_dep(name = "rules_nodejs", version = "0.0.0", dev_dependency = True)
+bazel_dep(name = "rules_nodejs")
 local_path_override(
     module_name = "rules_nodejs",
     path = "../..",
 )
 
-bazel_dep(name = "platforms", version = "0.0.10", dev_dependency = True)
+bazel_dep(name = "platforms", version = "1.0.0")
+bazel_dep(name = "rules_cc", version = "0.2.16")
 
-node = use_extension("@rules_nodejs//nodejs:extensions.bzl", "node", dev_dependency = True)
+node = use_extension("@rules_nodejs//nodejs:extensions.bzl", "node")
 node.toolchain(include_headers = True)
diff --git a/e2e/nodejs_host/.bazelversion b/e2e/nodejs_host/.bazelversion
diff --git a/e2e/nodejs_host/BUILD.bazel b/e2e/nodejs_host/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_shell//shell:sh_test.bzl", "sh_test")
+
 # Dummy test target that imports various targets from the
 # "@nodejs" repository. If a target of the repository is
 # misconfigured, Bazel will complain about missing input files.
diff --git a/e2e/nodejs_host/MODULE.bazel b/e2e/nodejs_host/MODULE.bazel
@@ -1,13 +1,14 @@
-bazel_dep(name = "rules_nodejs", version = "0.0.0", dev_dependency = True)
+bazel_dep(name = "rules_nodejs")
 local_path_override(
     module_name = "rules_nodejs",
     path = "../..",
 )
 
-bazel_dep(name = "bazel_lib", version = "3.0.0-beta.1", dev_dependency = True)
-bazel_dep(name = "bazel_skylib", version = "1.7.1", dev_dependency = True)
+bazel_dep(name = "bazel_lib", version = "3.0.0-beta.1")
+bazel_dep(name = "bazel_skylib", version = "1.7.1")
+bazel_dep(name = "rules_shell", version = "0.6.1")
 
-node = use_extension("@rules_nodejs//nodejs:extensions.bzl", "node", dev_dependency = True)
+node = use_extension("@rules_nodejs//nodejs:extensions.bzl", "node")
 
 # Note, this gets the default version of Node.js from
 # https://github.com/bazel-contrib/rules_nodejs/blob/5.8.0/nodejs/repositories.bzl#L11
diff --git a/e2e/smoke/.bazelversion b/e2e/smoke/.bazelversion
diff --git a/e2e/smoke/MODULE.bazel b/e2e/smoke/MODULE.bazel
@@ -1,14 +1,14 @@
-bazel_dep(name = "rules_nodejs", version = "0.0.0", dev_dependency = True)
+bazel_dep(name = "rules_nodejs")
 local_path_override(
     module_name = "rules_nodejs",
     path = "../..",
 )
 
-bazel_dep(name = "bazel_lib", version = "3.0.0-beta.1", dev_dependency = True)
-bazel_dep(name = "bazel_skylib", version = "1.7.1", dev_dependency = True)
-bazel_dep(name = "platforms", version = "0.0.10", dev_dependency = True)
+bazel_dep(name = "bazel_lib", version = "3.0.0")
+bazel_dep(name = "bazel_skylib", version = "1.8.1")
+bazel_dep(name = "platforms", version = "0.0.10")
 
-node = use_extension("@rules_nodejs//nodejs:extensions.bzl", "node", dev_dependency = True)
+node = use_extension("@rules_nodejs//nodejs:extensions.bzl", "node")
 node.toolchain(node_version = "16.5.0")
 node.toolchain(
     name = "node17",
diff --git a/internal/tsc.bzl b/internal/tsc.bzl
@@ -2,6 +2,11 @@
 TypeScript compiler.
 """
 
+load("@bazel_features//:features.bzl", "bazel_features")
+
+# toolchain_type targets are allowed with Bazel 9.0.0-pre.20250311.1 and later.
+_TOOLCHAIN_TYPES_SUPPORTED = bazel_features.rules.aspect_propagation_context
+
 def tsc(name, srcs, tsconfig, **kwargs):
     """
     Run the tsc typescript compiler.
@@ -29,9 +34,10 @@ def tsc(name, srcs, tsconfig, **kwargs):
             "--outDir",
             "$(RULEDIR)",
         ]),
-        toolchains = ["@node16_toolchains//:resolved_toolchain"],
-        tools = [
+        toolchains = ["//nodejs:toolchain_type"] if _TOOLCHAIN_TYPES_SUPPORTED else ["@node16_toolchains//:resolved_toolchain"],
+        tools = ([] if _TOOLCHAIN_TYPES_SUPPORTED else [
             "@node16_toolchains//:resolved_toolchain",
+        ]) + [
             "@npm_typescript",
             "@npm_types_node",
         ],
diff --git a/nodejs/private/current_node_cc_headers.bzl b/nodejs/private/current_node_cc_headers.bzl
@@ -14,6 +14,8 @@
 
 """Implementation of current_node_cc_headers rule."""
 
+load("@rules_cc//cc:defs.bzl", "CcInfo")
+
 def _current_node_cc_headers_impl(ctx):
     return ctx.toolchains["//nodejs:toolchain_type"].nodeinfo.headers.providers_map.values()
 
diff --git a/nodejs/repositories.bzl b/nodejs/repositories.bzl
@@ -259,6 +259,7 @@ filegroup(
 
     if repository_ctx.attr.include_headers:
         build_content += """
+load("@rules_cc//cc:defs.bzl", "cc_library")
 cc_library(
   name = "headers",
   hdrs = glob(
diff --git a/nodejs/toolchain.bzl b/nodejs/toolchain.bzl
@@ -15,6 +15,8 @@
 """This module implements the node toolchain rule.
 """
 
+load("@rules_cc//cc:defs.bzl", "CcInfo")
+
 NodeInfo = provider(
     doc = "Information about how to invoke Node.js and npm.",
     fields = {

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,10 @@`
`1`		`-bazel_dep(name = "rules_nodejs", version = "0.0.0", dev_dependency = True)`
	`1`	`+bazel_dep(name = "rules_nodejs")`
`2`	`2`	`local_path_override(`
`3`	`3`	`module_name = "rules_nodejs",`
`4`	`4`	`path = "../../..",`
`5`	`5`	`)`
`6`	`6`
`7`		`-node = use_extension("@rules_nodejs//nodejs:extensions.bzl", "node", dev_dependency = True)`
	`7`	`+node = use_extension("@rules_nodejs//nodejs:extensions.bzl", "node")`
`8`	`8`	`node.toolchain(`
`9`	`9`	`name = "mynode",`
`10`	`10`	`)`