Skip to content

Commit fdd5757

Browse files
committed
fix: filegroup circular deps
Previously generated `filegroup` targets can contain dependency cycle. The case here is that defined filegroup of a package should not have deps of other packages but rather to its `:data` package. This change removes potential dependency cycles and makes references to package's `:data`.
1 parent 87c56d7 commit fdd5757

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

apt/private/deb_translate_lock.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ alias(
3939
4040
filegroup(
4141
name = "{target_name}",
42-
srcs = select({deps}) + [":data"],
42+
srcs = select({deps}),
4343
visibility = ["//visibility:public"],
4444
)
4545
'''
@@ -191,7 +191,7 @@ def _deb_translate_lock_impl(rctx):
191191
control_targets = '"@%s//:control"' % repo_name,
192192
src = '"@%s//:data"' % repo_name,
193193
deps = starlark_codegen_utils.to_list_attr([
194-
"//%s/%s" % (dep["name"], package["arch"])
194+
"//%s/%s:data" % (dep["name"], package["arch"])
195195
for dep in package["dependencies"]
196196
]),
197197
urls = package["urls"],

apt/private/package.BUILD.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ filegroup(
1616
name = "{target_name}",
1717
srcs = {deps} + [":data"],
1818
visibility = ["//visibility:public"],
19-
)
19+
)

0 commit comments

Comments
 (0)