bazel
/
bazel-lib
mirror of https://github.com/bazel-contrib/bazel-lib
2
0
Fork 0
Code Issues Releases Activity

chore: update pre-bazel 6 work-around in utils to only apply for bazel versions < 6 (#320)

This commit is contained in:
Greg Magolan 2023-01-14 12:13:02 -08:00 committed by GitHub
parent 8d21ed00d4
commit 4edb5018e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/private/utils.bzl
View File

@ -76,11 +76,8 @@ def _is_external_label(param):
Returns:
a bool
"""
# Seems like a bug in Bazel that the workspace_root for a label like
# @@//js/private/node-patches:fs.js is "external"
# See https://github.com/bazelbuild/bazel/issues/16528
if str(param).startswith("@@//"):
if not _is_bazel_6_or_greater() and str(param).startswith("@@//"):
# Work-around for https://github.com/bazelbuild/bazel/issues/16528
return False
return len(_to_label(param).workspace_root) > 0

7
lib/tests/utils_test.bzl
View File

@ -51,12 +51,13 @@ def _is_external_label_test_impl(ctx):
asserts.false(env, utils.is_external_label("//some/label"))
asserts.false(env, utils.is_external_label(Label("//some/label")))
asserts.false(env, utils.is_external_label("@//some/label"))
# TODO(Bazel 6.0): enable this test when the @@ syntax is available
# asserts.false(env, utils.is_external_label("@@//some/label"))
asserts.false(env, utils.is_external_label(Label("@aspect_bazel_lib//some/label")))
asserts.false(env, ctx.attr.internal_with_workspace_as_string)
# the "@@" repository name syntax applies to Bazel 6 or greater
if utils.is_bazel_6_or_greater():
asserts.false(env, utils.is_external_label("@@//some/label"))
# assert that labels and string that give a workspace return true
asserts.true(env, utils.is_external_label(Label("@foo//some/label")))
asserts.true(env, ctx.attr.external_as_string)