Skip to content

Commit 4762cb4

Browse files
committed
support nolegacy_external_runfiles flag
1 parent 0d6da54 commit 4762cb4

3 files changed

Lines changed: 4 additions & 2 deletions

File tree

.bazelrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Bazel settings that apply to this repository.
22
# Take care to document any settings that you expect users to apply.
33
# Settings that apply only to CI are in .github/workflows/ci.bazelrc
4-
4+
build --nolegacy_external_runfiles
55

66
# Load any settings specific to the current user.
77
# .bazelrc.user should appear in .gitignore so that settings are not shared with team members

helm/private/rules/lint.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ _ATTRS = {
1717
}
1818

1919
def _impl(ctx):
20-
cmd = [ctx.var["HELM_BIN"]]
20+
cmd = [ctx.var["HELM_RUNFILES_BIN"]]
2121
cmd += ["lint"]
2222
cmd += [ctx.file.chart.short_path]
2323
if ctx.attr.strict:

helm/toolchain.bzl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ def _helm_toolchain_impl(ctx):
3535
# See https://docs.bazel.build/versions/main/be/make-variables.html#custom_variables
3636
template_variables = platform_common.TemplateVariableInfo({
3737
"HELM_BIN": target_tool_path,
38+
# Variable to use with disabled legacy_external_runfiles
39+
"HELM_RUNFILES_BIN": target_tool_path.replace("external/", "../", 1)
3840
})
3941
default = DefaultInfo(
4042
files = depset(tool_files),

0 commit comments

Comments
 (0)