Fix rules to work with --incompatible_auto_exec_groups

dzbarsky · dzbarsky · commit 92c9b82c6478 · 2025-01-11T13:00:10.000-05:00
diff --git a/.github/workflows/bazel7.bazelrc b/.github/workflows/bazel7.bazelrc
@@ -8,6 +8,9 @@ common --noexperimental_check_external_repository_files
 # but got aspect_bazel_lib@1.31.2 in the resolved dependency graph.
 common --check_direct_dependencies=off
 
+# Make sure we don't regress this.
+common --incompatible_auto_exec_groups
+
 # Directories used by sandboxed non-worker execution may be reused to avoid unnecessary setup costs.
 # Save time on Sandbox creation and deletion when many of the same kind of action run during the
 # build.
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -9,7 +9,7 @@ module(
 
 # Lower-bounds (minimum) versions for direct runtime dependencies.
 # Do not bump these unless rules_js requires a newer version to function.
-bazel_dep(name = "aspect_bazel_lib", version = "2.8.1")
+bazel_dep(name = "aspect_bazel_lib", version = "2.9.2")
 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.5")
diff --git a/e2e/bzlmod/other_module/MODULE.bazel b/e2e/bzlmod/other_module/MODULE.bazel
@@ -1,5 +1,6 @@
 module(name = "other_module")
 
+bazel_dep(name = "aspect_bazel_lib", version = "2.9.2")
 bazel_dep(name = "aspect_rules_js", version = "0.0.0")
 
 npm = use_extension("@aspect_rules_js//npm:extensions.bzl", "npm")
diff --git a/e2e/gyp_no_install_script/MODULE.bazel b/e2e/gyp_no_install_script/MODULE.bazel
@@ -4,7 +4,7 @@ local_path_override(
     path = "../..",
 )
 
-bazel_dep(name = "aspect_bazel_lib", version = "2.7.7", dev_dependency = True)
+bazel_dep(name = "aspect_bazel_lib", version = "2.9.2", dev_dependency = True)
 bazel_dep(name = "platforms", version = "0.0.9", dev_dependency = True)
 
 npm = use_extension(
diff --git a/e2e/js_image_oci/MODULE.bazel b/e2e/js_image_oci/MODULE.bazel
@@ -4,7 +4,7 @@ local_path_override(
     path = "../..",
 )
 
-bazel_dep(name = "aspect_bazel_lib", version = "2.7.7", dev_dependency = True)
+bazel_dep(name = "aspect_bazel_lib", version = "2.9.2", dev_dependency = True)
 bazel_dep(name = "container_structure_test", version = "1.16.0", dev_dependency = True)
 bazel_dep(name = "platforms", version = "0.0.10", dev_dependency = True)
 bazel_dep(name = "rules_nodejs", version = "6.3.0", dev_dependency = True)
diff --git a/e2e/js_run_devserver/MODULE.bazel b/e2e/js_run_devserver/MODULE.bazel
@@ -4,7 +4,7 @@ local_path_override(
     path = "../..",
 )
 
-bazel_dep(name = "aspect_bazel_lib", version = "2.7.7", dev_dependency = True)
+bazel_dep(name = "aspect_bazel_lib", version = "2.9.2", dev_dependency = True)
 bazel_dep(name = "bazel_skylib", version = "1.5.0", dev_dependency = True)
 bazel_dep(name = "rules_go", version = "0.46.0", dev_dependency = True)
 
diff --git a/e2e/npm_translate_lock/MODULE.bazel b/e2e/npm_translate_lock/MODULE.bazel
@@ -4,7 +4,7 @@ local_path_override(
     path = "../..",
 )
 
-bazel_dep(name = "aspect_bazel_lib", version = "2.7.7", dev_dependency = True)
+bazel_dep(name = "aspect_bazel_lib", version = "2.9.2", dev_dependency = True)
 bazel_dep(name = "bazel_skylib", version = "1.5.0", dev_dependency = True)
 bazel_dep(name = "platforms", version = "0.0.9", dev_dependency = True)
 
diff --git a/e2e/npm_translate_lock_disable_hooks/MODULE.bazel b/e2e/npm_translate_lock_disable_hooks/MODULE.bazel
@@ -4,7 +4,7 @@ local_path_override(
     path = "../..",
 )
 
-bazel_dep(name = "aspect_bazel_lib", version = "2.7.7", dev_dependency = True)
+bazel_dep(name = "aspect_bazel_lib", version = "2.9.2", dev_dependency = True)
 bazel_dep(name = "bazel_skylib", version = "1.5.0", dev_dependency = True)
 bazel_dep(name = "platforms", version = "0.0.9", dev_dependency = True)
 
diff --git a/e2e/npm_translate_lock_empty/MODULE.bazel b/e2e/npm_translate_lock_empty/MODULE.bazel
@@ -4,7 +4,7 @@ local_path_override(
     path = "../..",
 )
 
-bazel_dep(name = "aspect_bazel_lib", version = "2.7.7", dev_dependency = True)
+bazel_dep(name = "aspect_bazel_lib", version = "2.9.2", dev_dependency = True)
 bazel_dep(name = "bazel_skylib", version = "1.5.0", dev_dependency = True)
 bazel_dep(name = "platforms", version = "0.0.9", dev_dependency = True)
 
diff --git a/e2e/npm_translate_lock_replace_packages/MODULE.bazel b/e2e/npm_translate_lock_replace_packages/MODULE.bazel
@@ -6,7 +6,7 @@ module(
 
 bazel_dep(name = "platforms", version = "0.0.5")
 bazel_dep(name = "aspect_rules_js", version = "0.0.0")
-bazel_dep(name = "aspect_bazel_lib", version = "2.7.7")
+bazel_dep(name = "aspect_bazel_lib", version = "2.9.2")
 bazel_dep(name = "bazel_skylib", version = "1.5.0")
 
 local_path_override(
diff --git a/e2e/pnpm_lockfiles/MODULE.bazel b/e2e/pnpm_lockfiles/MODULE.bazel
@@ -22,7 +22,7 @@ PNPM_LOCK_TEST_CASES = [
     "versionless-patch-v9.yaml",
 ]
 
-bazel_dep(name = "aspect_bazel_lib", version = "2.7.7")
+bazel_dep(name = "aspect_bazel_lib", version = "2.9.2")
 
 bazel_dep(name = "bazel_skylib", version = "1.5.0", dev_dependency = True)
 bazel_dep(name = "rules_nodejs", version = "6.3.0", dev_dependency = True)
diff --git a/e2e/pnpm_workspace/MODULE.bazel b/e2e/pnpm_workspace/MODULE.bazel
@@ -6,7 +6,7 @@ local_path_override(
     path = "../..",
 )
 
-bazel_dep(name = "aspect_bazel_lib", version = "2.7.7", dev_dependency = True)
+bazel_dep(name = "aspect_bazel_lib", version = "2.9.2", dev_dependency = True)
 bazel_dep(name = "bazel_skylib", version = "1.5.0", dev_dependency = True)
 bazel_dep(name = "rules_nodejs", version = "6.3.0", dev_dependency = True)
 
diff --git a/e2e/pnpm_workspace_rerooted/MODULE.bazel b/e2e/pnpm_workspace_rerooted/MODULE.bazel
@@ -6,7 +6,7 @@ local_path_override(
     path = "../..",
 )
 
-bazel_dep(name = "aspect_bazel_lib", version = "2.7.7", dev_dependency = True)
+bazel_dep(name = "aspect_bazel_lib", version = "2.9.2", dev_dependency = True)
 bazel_dep(name = "bazel_skylib", version = "1.5.0", dev_dependency = True)
 bazel_dep(name = "rules_nodejs", version = "6.3.0", dev_dependency = True)
 
diff --git a/e2e/repo_mapping/MODULE.bazel b/e2e/repo_mapping/MODULE.bazel
@@ -5,7 +5,7 @@ module(
 )
 
 bazel_dep(name = "aspect_rules_js", version = "0.0.0", repo_name = "rules_js-repo_name")
-bazel_dep(name = "aspect_bazel_lib", version = "2.7.7")
+bazel_dep(name = "aspect_bazel_lib", version = "2.9.2")
 bazel_dep(name = "bazel_skylib", version = "1.5.0")
 
 local_path_override(
diff --git a/e2e/runfiles/MODULE.bazel b/e2e/runfiles/MODULE.bazel
@@ -6,7 +6,7 @@ local_path_override(
     path = "../..",
 )
 
-bazel_dep(name = "aspect_bazel_lib", version = "2.7.7", dev_dependency = True)
+bazel_dep(name = "aspect_bazel_lib", version = "2.9.2", dev_dependency = True)
 
 npm = use_extension(
     "@aspect_rules_js//npm:extensions.bzl",
diff --git a/e2e/stamped_package_json/MODULE.bazel b/e2e/stamped_package_json/MODULE.bazel
@@ -4,4 +4,4 @@ local_path_override(
     path = "../..",
 )
 
-bazel_dep(name = "aspect_bazel_lib", version = "2.7.7", dev_dependency = True)
+bazel_dep(name = "aspect_bazel_lib", version = "2.9.2", dev_dependency = True)
diff --git a/e2e/webpack_devserver/MODULE.bazel b/e2e/webpack_devserver/MODULE.bazel
@@ -4,7 +4,7 @@ local_path_override(
     path = "../..",
 )
 
-bazel_dep(name = "aspect_bazel_lib", version = "2.7.7", dev_dependency = True)
+bazel_dep(name = "aspect_bazel_lib", version = "2.9.2", dev_dependency = True)
 bazel_dep(name = "bazel_skylib", version = "1.5.0", dev_dependency = True)
 bazel_dep(name = "rules_go", version = "0.46.0", dev_dependency = True)
 
diff --git a/e2e/webpack_devserver_esm/MODULE.bazel b/e2e/webpack_devserver_esm/MODULE.bazel
@@ -4,7 +4,7 @@ local_path_override(
     path = "../..",
 )
 
-bazel_dep(name = "aspect_bazel_lib", version = "2.7.7", dev_dependency = True)
+bazel_dep(name = "aspect_bazel_lib", version = "2.9.2", dev_dependency = True)
 bazel_dep(name = "bazel_skylib", version = "1.5.0", dev_dependency = True)
 bazel_dep(name = "rules_go", version = "0.46.0", dev_dependency = True)
 
diff --git a/e2e/worker/MODULE.bazel b/e2e/worker/MODULE.bazel
@@ -4,7 +4,7 @@ local_path_override(
     path = "../..",
 )
 
-bazel_dep(name = "aspect_bazel_lib", version = "2.7.7", dev_dependency = True)
+bazel_dep(name = "aspect_bazel_lib", version = "2.9.2", dev_dependency = True)
 bazel_dep(name = "bazel_skylib", version = "1.5.0", dev_dependency = True)
 bazel_dep(name = "rules_nodejs", version = "6.3.0", dev_dependency = True)
 
diff --git a/npm/private/npm_package_store.bzl b/npm/private/npm_package_store.bzl
@@ -240,6 +240,7 @@ def _npm_package_store_impl(ctx):
                         "--directory",
                         package_store_directory.path,
                     ],
+                    toolchain = "@aspect_bazel_lib//lib:tar_toolchain_type",
                     mnemonic = "NpmPackageExtract",
                     progress_message = "Extracting npm package {}@{}".format(package, version),
                     # Workaround https://github.com/bazelbuild/bazel-central-registry/issues/2256

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ local_path_override(`
`4`	`4`	`path = "../..",`
`5`	`5`	`)`
`6`	`6`
`7`		`-bazel_dep(name = "aspect_bazel_lib", version = "2.7.7", dev_dependency = True)`
	`7`	`+bazel_dep(name = "aspect_bazel_lib", version = "2.9.2", dev_dependency = True)`
`8`	`8`	`bazel_dep(name = "platforms", version = "0.0.9", dev_dependency = True)`
`9`	`9`
`10`	`10`	`npm = use_extension(`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ PNPM_LOCK_TEST_CASES = [`
`22`	`22`	`"versionless-patch-v9.yaml",`
`23`	`23`	`]`
`24`	`24`
`25`		`-bazel_dep(name = "aspect_bazel_lib", version = "2.7.7")`
	`25`	`+bazel_dep(name = "aspect_bazel_lib", version = "2.9.2")`
`26`	`26`
`27`	`27`	`bazel_dep(name = "bazel_skylib", version = "1.5.0", dev_dependency = True)`
`28`	`28`	`bazel_dep(name = "rules_nodejs", version = "6.3.0", dev_dependency = True)`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ local_path_override(`
`6`	`6`	`path = "../..",`
`7`	`7`	`)`
`8`	`8`
`9`		`-bazel_dep(name = "aspect_bazel_lib", version = "2.7.7", dev_dependency = True)`
	`9`	`+bazel_dep(name = "aspect_bazel_lib", version = "2.9.2", dev_dependency = True)`
`10`	`10`	`bazel_dep(name = "bazel_skylib", version = "1.5.0", dev_dependency = True)`
`11`	`11`	`bazel_dep(name = "rules_nodejs", version = "6.3.0", dev_dependency = True)`
`12`	`12`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ module(`
`5`	`5`	`)`
`6`	`6`
`7`	`7`	`bazel_dep(name = "aspect_rules_js", version = "0.0.0", repo_name = "rules_js-repo_name")`
`8`		`-bazel_dep(name = "aspect_bazel_lib", version = "2.7.7")`
	`8`	`+bazel_dep(name = "aspect_bazel_lib", version = "2.9.2")`
`9`	`9`	`bazel_dep(name = "bazel_skylib", version = "1.5.0")`
`10`	`10`
`11`	`11`	`local_path_override(`
Original file line number	Diff line number	Diff line change
`@@ -4,4 +4,4 @@ local_path_override(`
`4`	`4`	`path = "../..",`
`5`	`5`	`)`
`6`	`6`
`7`		`-bazel_dep(name = "aspect_bazel_lib", version = "2.7.7", dev_dependency = True)`
	`7`	`+bazel_dep(name = "aspect_bazel_lib", version = "2.9.2", dev_dependency = True)`