CHANGELOG.md

+# [1.0.0-beta.17](https://git.gitlab.arm.com/bazel/toolchain_utils/compare/v1.0.0-beta.16...v1.0.0-beta.17) (2024-10-28)
+
+### Bug Fixes
+
+- detect both `WORKSPACE` and `REPO.bazel` in repositories ([f1e46c3](https://git.gitlab.arm.com/bazel/toolchain_utils/commit/f1e46c3f142c0665f90119996f0ebb8048dfb0c7))
+
 # [1.0.0-beta.16](https://git.gitlab.arm.com/bazel/toolchain_utils/compare/v1.0.0-beta.15...v1.0.0-beta.16) (2024-10-21)
 
 ### Bug Fixes

MODULE.bazel

 module(
     name = "toolchain_utils",
-    version = "1.0.0-beta.16",
+    version = "1.0.0-beta.17",
     bazel_compatibility = [
-        ">=7.1.0",
+        ">=7.0.0",
     ],
     compatibility_level = 1,
 )

toolchain/export/symlink/repository.bzl

+load("//toolchain/repository:root.bzl", "root")
+
 visibility("//toolchain/export/...")
 
 DOC = "Symlinks a repository to another."
@@ -11,13 +13,11 @@ ATTRS = {
 
 def implementation(rctx):
     label = rctx.attr.target
-    workspace = label.relative(":REPO.bazel")
-    path = rctx.path(workspace)
-    if not path.exists:
-        fail("Failed to find `{}`, can only symlink repository labels.".format(path, label))
-    target = path.dirname
+    path = root(rctx, label)
+    if not path:
+        fail("Can only symlink repository labels.".format(label))
     rctx.delete(".")
-    rctx.symlink(target, ".")
+    rctx.symlink(path, ".")
 
 symlink = repository_rule(
     doc = DOC,

toolchain/local/select/repository.bzl

+load("//toolchain/repository:root.bzl", "root")
 load("//toolchain:separator.bzl", "SEPARATOR")
 load(":resolve.bzl", resolve = "key")
 
@@ -34,19 +35,17 @@ toolchian_local_select(
 
 def canonical(rctx, label):
     prefix = SEPARATOR.join(rctx.name.split(SEPARATOR)[:-1])
-    return "@@{}{}{}".format(prefix, SEPARATOR, label.removeprefix("@"))
+    return Label("@@{}{}{}".format(prefix, SEPARATOR, label.removeprefix("@")))
 
 def implementation(rctx):
     label = resolve(rctx.attr.map, no_match_error = rctx.attr.no_match_error)
     canon = canonical(rctx, label)
-    workspace = Label("{}//:REPO.bazel".format(canon))
-    path = rctx.path(workspace)
-
-    if not path.exists:
-        fail("Missing `{}` for `{}`: {}".format(canon, rctx.name, path))
+    path = root(rctx, canon)
+    if not path:
+        fail("Missing `{}` for `{}`".format(canon, rctx.name))
 
     rctx.delete(".")
-    rctx.symlink(path.dirname, ".")
+    rctx.symlink(path, ".")
 
 select = repository_rule(
     doc = DOC,

toolchain/repository/root.bzl

+visibility("//...")
+
+def root(rctx, label):
+    workspace = label.relative("WORKSPACE")
+    path = rctx.path(workspace)
+    if path.exists:
+        return path.dirname
+
+    repo = label.relative("REPO.bazel")
+    path = rctx.path(repo)
+    if path.exists:
+        return path.dirname
+
+    return None