Fixes _module_repo_name when building with Bazel@HEAD or Bazel 7.1

If `get_canonical_repo_name` no longer returns the repo name with version due to containing bazelbuild@a54a393, the `_module_repo_name` should not either. Fixes: bazelbuild#21292 Closes bazelbuild#21324. PiperOrigin-RevId: 606646238 Change-Id: I8835a84842c2c66929586b39156eb9f5a541652f
fweikert · Feb 23, 2024 · db378c2 · db378c2
1 parent add245c
commit db378c2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock
diff --git a/src/tools/bzlmod/utils.bzl b/src/tools/bzlmod/utils.bzl
@@ -137,4 +137,9 @@ def _module_repo_name(module):
     module_name = module["name"]
     if module_name in _WELL_KNOWN_MODULES:
         return module_name
+
+    # TODO(pcloudy): Simplify the following logic after we upgrade to 7.1
+    if get_canonical_repo_name("rules_cc").endswith("~"):
+        return "{}~".format(module_name)
+
     return "{}~{}".format(module_name, module["version"])