Fix rules_sh autoloads to rules_shell

PiperOrigin-RevId: 683179562 Change-Id: I7e0885e33b65dc5e24be705a676108c2aa3c8e9a
bazelbuild · Oct 9, 2024 · e00fa72 · e00fa72
1 parent f3e031d
commit e00fa72
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/packages/AutoloadSymbols.java b/src/main/java/com/google/devtools/build/lib/packages/AutoloadSymbols.java
@@ -605,7 +605,7 @@ private static SymbolRedirect renamedSymbolRedirect(
           "rules_java_builtin",
           "rules_python",
           "rules_python_internal",
-          "rules_sh",
+          "rules_shell",
           "apple_common",
           "bazel_skylib",
           "bazel_tools",
@@ -785,9 +785,9 @@ private static SymbolRedirect renamedSymbolRedirect(
           .put("py_library", ruleRedirect("@rules_python//python:py_library.bzl"))
           .put("py_runtime", ruleRedirect("@rules_python//python:py_runtime.bzl"))
           .put("py_test", ruleRedirect("@rules_python//python:py_test.bzl"))
-          .put("sh_binary", ruleRedirect("@rules_sh//sh:sh_binary.bzl"))
-          .put("sh_library", ruleRedirect("@rules_sh//sh:sh_library.bzl"))
-          .put("sh_test", ruleRedirect("@rules_sh//sh:sh_test.bzl"))
+          .put("sh_binary", ruleRedirect("@rules_shell//shell:sh_binary.bzl"))
+          .put("sh_library", ruleRedirect("@rules_shell//shell:sh_library.bzl"))
+          .put("sh_test", ruleRedirect("@rules_shell//shell:sh_test.bzl"))
           .put("available_xcodes", ruleRedirect("@apple_support//xcode:available_xcodes.bzl"))
           .put("xcode_config", ruleRedirect("@apple_support//xcode:xcode_config.bzl"))
           .put("xcode_config_alias", ruleRedirect("@apple_support//xcode:xcode_config_alias.bzl"))

diff --git a/src/test/shell/integration/load_removed_symbols_test.sh b/src/test/shell/integration/load_removed_symbols_test.sh
@@ -87,7 +87,8 @@ local_path_override(
 EOF
 }
 
-function test_missing_necessary_bzlmod_dep() {
+# TODO - ilist@: reeenable with a fake repository (we now have autoload all of them)
+function disabled_test_missing_necessary_bzlmod_dep() {
   # Intentionally not adding rules_android to MODULE.bazel
   cat > BUILD << EOF
 sh_library(
@@ -100,7 +101,8 @@ EOF
   expect_log "WARNING: Couldn't auto load rules or symbols, because no dependency on module/repository 'rules_sh' found. This will result in a failure if there's a reference to those rules or symbols."
 }
 
-function test_missing_unnecessary_bzmod_dep() {
+# TODO - ilist@: reeenable with a fake repository (we now have autoload all of them)
+function disabled_test_missing_unnecessary_bzmod_dep() {
   # Intentionally not adding rules_android to MODULE.bazel
   cat > BUILD << EOF
 filegroup(