Merge pull request bazelbuild#13 from meteorcloudy/registries

Support using %workspace% in registry URL
meteorcloudy · May 17, 2021 · db0338d · db0338d
2 parents c660ce5 + 3ee4868
commit db0338d
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleFileFunction.java b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleFileFunction.java
@@ -199,7 +199,8 @@ private Optional<GetModuleFileResult> getModuleFile(ModuleKey key, StarlarkOverr
     ImmutableList.Builder<Registry> registryObjects = new ImmutableList.Builder<>();
     for (String registryUrl : registries) {
       try {
-        registryObjects.add(registryFactory.getRegistryWithUrl(registryUrl));
+        registryObjects.add(registryFactory.getRegistryWithUrl(
+            registryUrl.replace("%workspace%", workspaceRoot.getPathString())));
       } catch (URISyntaxException e) {
         throw new ModuleFileFunctionException(e);
       }