Skip to content

Commit 6a12040

Browse files
committed
fix: return correct extension metadata
1 parent 1f0870c commit 6a12040

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

e2e/smoke/MODULE.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ oci.pull(
2121
"linux/arm64",
2222
],
2323
)
24-
use_repo(oci, "distroless_base")
24+
use_repo(oci, "distroless_base", "distroless_base_linux_amd64", "distroless_base_linux_arm64")

oci/extensions.bzl

+9-4
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,21 @@ def _oci_extension(module_ctx):
4242
)
4343

4444
if mod.is_root:
45-
if module_ctx.is_dev_dependency(pull):
46-
root_direct_dev_deps.append(pull.name)
47-
else:
48-
root_direct_deps.append(pull.name)
45+
deps = root_direct_dev_deps if module_ctx.is_dev_dependency(pull) else root_direct_deps
46+
deps.append(pull.name)
47+
for platform in pull.platforms:
48+
deps.append("_".join([pull.name] + platform.split("/")))
49+
4950
for toolchains in mod.tags.toolchains:
5051
if toolchains.name != "oci" and not mod.is_root:
5152
fail("""\
5253
Only the root module may override the default name for the oci toolchains.
5354
This prevents conflicting registrations in the global namespace of external repos.
5455
""")
56+
if mod.is_root:
57+
deps = root_direct_dev_deps if module_ctx.is_dev_dependency(toolchains) else root_direct_deps
58+
deps.append("%s_crane_toolchains" % toolchains.name)
59+
deps.append("%s_regctl_toolchains" % toolchains.name)
5560

5661
oci_register_toolchains(toolchains.name, register = False)
5762

0 commit comments

Comments
 (0)