Skip to content

Commit

Permalink
refactor: remove usage of @bazel_tools//src/conditions
Browse files Browse the repository at this point in the history
  • Loading branch information
@thesayyn
thesayyn committed Dec 19, 2021
1 parent b178092 commit e505480
Show file tree
Hide file tree
Showing 15 changed files with 85 additions and 78 deletions.
3 changes: 1 addition & 2 deletions .bazelrc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,5 +52,4 @@ build:docker-sandbox --experimental_docker_image=gcr.io/cloud-marketplace/google
build --incompatible_no_implicit_file_export
# TODO(mattem): flip this when dependencies allow
# build --incompatible_struct_has_no_methods
# TODO(alexeagle): turn on this flag when dependencies allow
# build --incompatible_use_platforms_repo_for_constraints
build --incompatible_use_platforms_repo_for_constraints
2 changes: 1 addition & 1 deletion WORKSPACE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ nodejs_register_toolchains(

nodejs_register_toolchains(
name = "node15",
node_version = "15.14.0",
node_version = "16.5.0",
)

load("@build_bazel_rules_nodejs//:npm_deps.bzl", "npm_deps")
Expand Down
26 changes: 13 additions & 13 deletions e2e/core/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ write_file(
# alias(
# name = "node_bin",
# actual = select({
# "@bazel_tools//src/conditions:darwin_arm64": "@node16_darwin_arm64//:node_bin",
# "@bazel_tools//src/conditions:darwin_x86_64": "@node16_darwin_amd64//:node_bin",
# "@bazel_tools//src/conditions:linux_aarch64": "@node16_linux_arm64//:node_bin",
# "@bazel_tools//src/conditions:linux_s390x": "@node16_linux_s390x//:node_bin",
# "@bazel_tools//src/conditions:linux_x86_64": "@node16_linux_amd64//:node_bin",
# "@bazel_tools//src/conditions:linux_ppc64le": "@node16_linux_ppc64le//:node_bin",
# "@bazel_tools//src/conditions:windows": "@node16_windows_amd64//:node_bin",
# "@rules_nodejs//nodejs:is_darwin_arm64": "@node16_darwin_arm64//:node_bin",
# "@rules_nodejs//nodejs:is_darwin_amd64": "@node16_darwin_amd64//:node_bin",
# "@rules_nodejs//nodejs:is_linux_arm64": "@node16_linux_arm64//:node_bin",
# "@rules_nodejs//nodejs:is_linux_s390x": "@node16_linux_s390x//:node_bin",
# "@rules_nodejs//nodejs:is_linux_amd64": "@node16_linux_amd64//:node_bin",
# "@rules_nodejs//nodejs:is_linux_ppc64le": "@node16_linux_ppc64le//:node_bin",
# "@rules_nodejs//nodejs:is_windows_amd64": "@node16_windows_amd64//:node_bin",
# "//conditions:default": "@node16_linux_amd64//:node_bin",
# }),
# )
Expand Down Expand Up @@ -213,9 +213,9 @@ my_nodejs(
# using the select statement will download toolchains for all three platforms
# you can also just provide an individual toolchain if you don't want to download them all
toolchain = select({
"@bazel_tools//src/conditions:linux_x86_64": "@node15_linux_amd64//:node_toolchain",
"@bazel_tools//src/conditions:darwin": "@node15_darwin_amd64//:node_toolchain",
"@bazel_tools//src/conditions:windows": "@node15_windows_amd64//:node_toolchain",
"@rules_nodejs//nodejs:is_linux_amd64": "@node15_linux_amd64//:node_toolchain",
"@rules_nodejs//nodejs:is_darwin_amd64": "@node15_darwin_amd64//:node_toolchain",
"@rules_nodejs//nodejs:is_windows_amd64": "@node15_windows_amd64//:node_toolchain",
}),
)

Expand All @@ -233,9 +233,9 @@ my_nodejs(
# using the select statement will download toolchains for all three platforms
# you can also just provide an individual toolchain if you don't want to download them all
toolchain = select({
"@bazel_tools//src/conditions:linux_x86_64": "@node16_linux_amd64//:node_toolchain",
"@bazel_tools//src/conditions:darwin": "@node16_darwin_amd64//:node_toolchain",
"@bazel_tools//src/conditions:windows": "@node16_windows_amd64//:node_toolchain",
"@rules_nodejs//nodejs:is_linux_amd64": "@node16_linux_amd64//:node_toolchain",
"@rules_nodejs//nodejs:is_darwin_amd64": "@node16_darwin_amd64//:node_toolchain",
"@rules_nodejs//nodejs:is_windows_amd64": "@node16_windows_amd64//:node_toolchain",
}),
)

Expand Down
2 changes: 1 addition & 1 deletion internal/common/copy_to_bin.bzl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ def copy_to_bin(name, srcs, **kwargs):
name = name,
srcs = srcs,
is_windows = select({
"@bazel_tools//src/conditions:host_windows": True,
"@rules_nodejs//nodejs:is_windows_amd64": True,
"//conditions:default": False,
}),
**kwargs
Expand Down
2 changes: 1 addition & 1 deletion internal/common/params_file.bzl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ def params_file(
data = data,
newline = newline or "auto",
is_windows = select({
"@bazel_tools//src/conditions:host_windows": True,
"@rules_nodejs//nodejs:is_windows_amd64": True,
"//conditions:default": False,
}),
**kwargs
Expand Down
2 changes: 1 addition & 1 deletion internal/js_library/js_library.bzl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@ def js_library(
# TODO: remove once legacy module_mapping is removed
module_name = package_name if package_name != "$node_modules$" and package_name != "$node_modules_dir$" else None,
is_windows = select({
"@bazel_tools//src/conditions:host_windows": True,
"@rules_nodejs//nodejs:is_windows_amd64": True,
"//conditions:default": False,
}),
**kwargs
Expand Down
2 changes: 1 addition & 1 deletion internal/linker/npm_link.bzl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ set to the target's package & the files provided from the targets DefaultInfo.
package_name = package_name,
package_path = package_path,
is_windows = select({
"@bazel_tools//src/conditions:host_windows": True,
"@rules_nodejs//nodejs:is_windows_amd64": True,
"//conditions:default": False,
}),
**kwargs
Expand Down
60 changes: 30 additions & 30 deletions internal/node/test/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -558,9 +558,9 @@ nodejs_binary(
# using the select statement will download toolchains for all three platforms
# you can also just provide an individual toolchain if you don't want to download them all
toolchain = select({
"@bazel_tools//src/conditions:linux_x86_64": "@node15_linux_amd64//:node_toolchain",
"@bazel_tools//src/conditions:darwin": "@node15_darwin_amd64//:node_toolchain",
"@bazel_tools//src/conditions:windows": "@node15_windows_amd64//:node_toolchain",
"@rules_nodejs//nodejs:is_linux_amd64": "@node15_linux_amd64//:node_toolchain",
"@rules_nodejs//nodejs:is_darwin_amd64": "@node15_darwin_amd64//:node_toolchain",
"@rules_nodejs//nodejs:is_windows_amd64": "@node15_windows_amd64//:node_toolchain",
}),
)

Expand All @@ -570,9 +570,9 @@ nodejs_binary(
# using the select statement will download toolchains for all three platforms
# you can also just provide an individual toolchain if you don't want to download them all
toolchain = select({
"@bazel_tools//src/conditions:linux_x86_64": "@node16_linux_amd64//:node_toolchain",
"@bazel_tools//src/conditions:darwin": "@node16_darwin_amd64//:node_toolchain",
"@bazel_tools//src/conditions:windows": "@node16_windows_amd64//:node_toolchain",
"@rules_nodejs//nodejs:is_linux_amd64": "@node16_linux_amd64//:node_toolchain",
"@rules_nodejs//nodejs:is_darwin_amd64": "@node16_darwin_amd64//:node_toolchain",
"@rules_nodejs//nodejs:is_windows_amd64": "@node16_windows_amd64//:node_toolchain",
}),
)

Expand All @@ -587,9 +587,9 @@ nodejs_test(
# using the select statement will download toolchains for all three platforms
# you can also just provide an individual toolchain if you don't want to download them all
toolchain = select({
"@bazel_tools//src/conditions:linux_x86_64": "@node15_linux_amd64//:node_toolchain",
"@bazel_tools//src/conditions:darwin": "@node15_darwin_amd64//:node_toolchain",
"@bazel_tools//src/conditions:windows": "@node15_windows_amd64//:node_toolchain",
"@rules_nodejs//nodejs:is_linux_amd64": "@node15_linux_amd64//:node_toolchain",
"@rules_nodejs//nodejs:is_darwin_amd64": "@node15_darwin_amd64//:node_toolchain",
"@rules_nodejs//nodejs:is_windows_amd64": "@node15_windows_amd64//:node_toolchain",
}),
)

Expand All @@ -599,9 +599,9 @@ nodejs_test(
# using the select statement will download toolchains for all three platforms
# you can also just provide an individual toolchain if you don't want to download them all
toolchain = select({
"@bazel_tools//src/conditions:linux_x86_64": "@node16_linux_amd64//:node_toolchain",
"@bazel_tools//src/conditions:darwin": "@node16_darwin_amd64//:node_toolchain",
"@bazel_tools//src/conditions:windows": "@node16_windows_amd64//:node_toolchain",
"@rules_nodejs//nodejs:is_linux_amd64": "@node16_linux_amd64//:node_toolchain",
"@rules_nodejs//nodejs:is_darwin_amd64": "@node16_darwin_amd64//:node_toolchain",
"@rules_nodejs//nodejs:is_windows_amd64": "@node16_windows_amd64//:node_toolchain",
}),
)

Expand All @@ -626,14 +626,14 @@ nodejs_test(
# using the select statement will download toolchains for all platforms
# you can also just provide an individual toolchain if you don't want to download them all
select({
"@bazel_tools//src/conditions:linux_x86_64": "@node16_linux_amd64//:node_toolchain",
"@bazel_tools//src/conditions:darwin": "@node16_darwin_amd64//:node_toolchain",
"@bazel_tools//src/conditions:windows": "@node16_windows_amd64//:node_toolchain",
"@rules_nodejs//nodejs:is_linux_amd64": "@node16_linux_amd64//:node_toolchain",
"@rules_nodejs//nodejs:is_darwin_amd64": "@node16_darwin_amd64//:node_toolchain",
"@rules_nodejs//nodejs:is_windows_amd64": "@node16_windows_amd64//:node_toolchain",
}),
select({
"@bazel_tools//src/conditions:linux_x86_64": "@node15_linux_amd64//:node_toolchain",
"@bazel_tools//src/conditions:darwin": "@node15_darwin_amd64//:node_toolchain",
"@bazel_tools//src/conditions:windows": "@node15_windows_amd64//:node_toolchain",
"@rules_nodejs//nodejs:is_linux_amd64": "@node15_linux_amd64//:node_toolchain",
"@rules_nodejs//nodejs:is_darwin_amd64": "@node15_darwin_amd64//:node_toolchain",
"@rules_nodejs//nodejs:is_windows_amd64": "@node15_windows_amd64//:node_toolchain",
}),
],
)
Expand Down Expand Up @@ -661,14 +661,14 @@ nodejs_test(
# using the select statement will download toolchains for all platforms
# you can also just provide an individual toolchain if you don't want to download them all
select({
"@bazel_tools//src/conditions:linux_x86_64": "@node16_linux_amd64//:node_toolchain",
"@bazel_tools//src/conditions:darwin": "@node16_darwin_amd64//:node_toolchain",
"@bazel_tools//src/conditions:windows": "@node16_windows_amd64//:node_toolchain",
"@rules_nodejs//nodejs:is_linux_amd64": "@node16_linux_amd64//:node_toolchain",
"@rules_nodejs//nodejs:is_darwin_amd64": "@node16_darwin_amd64//:node_toolchain",
"@rules_nodejs//nodejs:is_windows_amd64": "@node16_windows_amd64//:node_toolchain",
}),
select({
"@bazel_tools//src/conditions:linux_x86_64": "@node15_linux_amd64//:node_toolchain",
"@bazel_tools//src/conditions:darwin": "@node15_darwin_amd64//:node_toolchain",
"@bazel_tools//src/conditions:windows": "@node15_windows_amd64//:node_toolchain",
"@rules_nodejs//nodejs:is_linux_amd64": "@node15_linux_amd64//:node_toolchain",
"@rules_nodejs//nodejs:is_darwin_amd64": "@node15_darwin_amd64//:node_toolchain",
"@rules_nodejs//nodejs:is_windows_amd64": "@node15_windows_amd64//:node_toolchain",
}),
],
)
Expand Down Expand Up @@ -697,14 +697,14 @@ nodejs_test(
# using the select statement will download toolchains for all platforms
# you can also just provide an individual toolchain if you don't want to download them all
select({
"@bazel_tools//src/conditions:linux_x86_64": "@node16_linux_amd64//:node_toolchain",
"@bazel_tools//src/conditions:darwin": "@node16_darwin_amd64//:node_toolchain",
"@bazel_tools//src/conditions:windows": "@node16_windows_amd64//:node_toolchain",
"@rules_nodejs//nodejs:is_linux_amd64": "@node16_linux_amd64//:node_toolchain",
"@rules_nodejs//nodejs:is_darwin_amd64": "@node16_darwin_amd64//:node_toolchain",
"@rules_nodejs//nodejs:is_windows_amd64": "@node16_windows_amd64//:node_toolchain",
}),
select({
"@bazel_tools//src/conditions:linux_x86_64": "@node15_linux_amd64//:node_toolchain",
"@bazel_tools//src/conditions:darwin": "@node15_darwin_amd64//:node_toolchain",
"@bazel_tools//src/conditions:windows": "@node15_windows_amd64//:node_toolchain",
"@rules_nodejs//nodejs:is_linux_amd64": "@node15_linux_amd64//:node_toolchain",
"@rules_nodejs//nodejs:is_darwin_amd64": "@node15_darwin_amd64//:node_toolchain",
"@rules_nodejs//nodejs:is_windows_amd64": "@node15_windows_amd64//:node_toolchain",
}),
],
)
Expand Down
4 changes: 2 additions & 2 deletions internal/pkg_npm/pkg_npm.bzl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -380,15 +380,15 @@ def pkg_npm_macro(name, tgz = None, **kwargs):
native.alias(
name = name + ".pack",
actual = select({
"@bazel_tools//src/conditions:host_windows": name + ".pack.bat",
"@rules_nodejs//nodejs:is_windows_amd64": name + ".pack.bat",
"//conditions:default": name + ".pack.sh",
}),
)

native.alias(
name = name + ".publish",
actual = select({
"@bazel_tools//src/conditions:host_windows": name + ".publish.bat",
"@rules_nodejs//nodejs:is_windows_amd64": name + ".publish.bat",
"//conditions:default": name + ".publish.sh",
}),
)
Expand Down
8 changes: 8 additions & 0 deletions nodejs/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,11 @@ toolchain_type(
)
for key, values in PLATFORMS.items()
]

[
config_setting(
name = "is_%s" % key,
constraint_values = values.compatible_with,
)
for key, values in PLATFORMS.items()
]
2 changes: 1 addition & 1 deletion third_party/github.com/bazelbuild/bazel-skylib/rules/private/copy_file_private.bzl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ def copy_file(name, src, out, is_directory = False, is_executable = False, allow
src = src,
out = out,
is_windows = select({
"@bazel_tools//src/conditions:host_windows": True,
"@rules_nodejs//nodejs:is_windows_amd64": True,
"//conditions:default": False,
}),
is_executable = is_executable,
Expand Down
4 changes: 2 additions & 2 deletions third_party/github.com/bazelbuild/bazel-skylib/rules/private/write_file_private.bzl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ def write_file(
out = out,
newline = newline or "auto",
is_windows = select({
"@bazel_tools//src/conditions:host_windows": True,
"@rules_nodejs//nodejs:is_windows_amd64": True,
"//conditions:default": False,
}),
**kwargs
Expand All @@ -107,7 +107,7 @@ def write_file(
out = out,
newline = newline or "auto",
is_windows = select({
"@bazel_tools//src/conditions:host_windows": True,
"@rules_nodejs//nodejs:is_windows_amd64": True,
"//conditions:default": False,
}),
**kwargs
Expand Down
16 changes: 8 additions & 8 deletions toolchains/cypress/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ toolchain_type(name = "toolchain_type")
alias(
name = "toolchain",
actual = select({
"@bazel_tools//src/conditions:darwin_x86_64": ":cypress_darwin_toolchain_config",
"@bazel_tools//src/conditions:darwin_arm64": ":cypress_darwin_arm64_toolchain_config",
"@bazel_tools//src/conditions:linux_x86_64": ":cypress_linux_toolchain_config",
"@bazel_tools//src/conditions:windows": ":cypress_windows_toolchain_config",
"@rules_nodejs//nodejs:is_darwin_amd64": ":cypress_darwin_toolchain_config",
"@rules_nodejs//nodejs:is_darwin_arm64": ":cypress_darwin_arm64_toolchain_config",
"@rules_nodejs//nodejs:is_linux_amd64": ":cypress_linux_toolchain_config",
"@rules_nodejs//nodejs:is_windows_amd64": ":cypress_windows_toolchain_config",
"//conditions:default": ":cypress_linux_toolchain_config",
}),
visibility = ["//visibility:public"],
Expand All @@ -51,10 +51,10 @@ alias(
alias(
name = "cypress_bin",
actual = select({
"@bazel_tools//src/conditions:darwin_x86_64": "@cypress_darwin//:bin",
"@bazel_tools//src/conditions:darwin_arm64": "@cypress_darwin_arm64//:bin",
"@bazel_tools//src/conditions:linux_x86_64": "@cypress_linux//:bin",
"@bazel_tools//src/conditions:windows": "@cypress_windows//:bin",
"@rules_nodejs//nodejs:is_darwin_amd64": "@cypress_darwin//:bin",
"@rules_nodejs//nodejs:is_darwin_arm64": "@cypress_darwin_arm64//:bin",
"@rules_nodejs//nodejs:is_linux_amd64": "@cypress_linux//:bin",
"@rules_nodejs//nodejs:is_windows_amd64": "@cypress_windows//:bin",
"//conditions:default": "@cypress_linux//:bin",
}),
visibility = ["//visibility:public"],
Expand Down
2 changes: 1 addition & 1 deletion toolchains/esbuild/esbuild_repositories.bzl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def esbuild_repositories(name = "", npm_repository = "npm", npm_args = []):
npm_args: additional args to pass to the npm install rule
"""

_maybe(
maybe(
http_archive,
name = "bazel_skylib",
sha256 = "c6966ec828da198c5d9adbaa94c05e3a1c7f21bd012a0b29ba8ddbccb2c93b0d",
Expand Down
28 changes: 14 additions & 14 deletions toolchains/node/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@ toolchain_type(
alias(
name = "toolchain",
actual = select({
"@bazel_tools//src/conditions:darwin_arm64": "@nodejs_darwin_arm64_config//:toolchain",
"@bazel_tools//src/conditions:darwin_x86_64": "@nodejs_darwin_amd64_config//:toolchain",
"@bazel_tools//src/conditions:linux_aarch64": "@nodejs_linux_arm64_config//:toolchain",
"@bazel_tools//src/conditions:linux_s390x": "@nodejs_linux_s390x_config//:toolchain",
"@bazel_tools//src/conditions:linux_x86_64": "@nodejs_linux_amd64_config//:toolchain",
"@bazel_tools//src/conditions:windows": "@nodejs_windows_amd64_config//:toolchain",
"@bazel_tools//src/conditions:linux_ppc64le": "@nodejs_linux_ppc64le_config//:toolchain",
"@rules_nodejs//nodejs:is_darwin_arm64": "@nodejs_darwin_arm64_config//:toolchain",
"@rules_nodejs//nodejs:is_darwin_amd64": "@nodejs_darwin_amd64_config//:toolchain",
"@rules_nodejs//nodejs:is_linux_arm64": "@nodejs_linux_arm64_config//:toolchain",
"@rules_nodejs//nodejs:is_linux_s390x": "@nodejs_linux_s390x_config//:toolchain",
"@rules_nodejs//nodejs:is_linux_amd64": "@nodejs_linux_amd64_config//:toolchain",
"@rules_nodejs//nodejs:is_windows_amd64": "@nodejs_windows_amd64_config//:toolchain",
"@rules_nodejs//nodejs:is_linux_ppc64le": "@nodejs_linux_ppc64le_config//:toolchain",
"//conditions:default": "@nodejs_linux_amd64_config//:toolchain",
}),
visibility = ["//visibility:public"],
Expand All @@ -56,13 +56,13 @@ alias(
alias(
name = "node_bin",
actual = select({
"@bazel_tools//src/conditions:darwin_arm64": "@nodejs_darwin_arm64//:node_bin",
"@bazel_tools//src/conditions:darwin_x86_64": "@nodejs_darwin_amd64//:node_bin",
"@bazel_tools//src/conditions:linux_aarch64": "@nodejs_linux_arm64//:node_bin",
"@bazel_tools//src/conditions:linux_s390x": "@nodejs_linux_s390x//:node_bin",
"@bazel_tools//src/conditions:linux_x86_64": "@nodejs_linux_amd64//:node_bin",
"@bazel_tools//src/conditions:linux_ppc64le": "@nodejs_linux_ppc64le//:node_bin",
"@bazel_tools//src/conditions:windows": "@nodejs_windows_amd64//:node_bin",
"@rules_nodejs//nodejs:is_darwin_arm64": "@nodejs_darwin_arm64//:node_bin",
"@rules_nodejs//nodejs:is_darwin_amd64": "@nodejs_darwin_amd64//:node_bin",
"@rules_nodejs//nodejs:is_linux_arm64": "@nodejs_linux_arm64//:node_bin",
"@rules_nodejs//nodejs:is_linux_s390x": "@nodejs_linux_s390x//:node_bin",
"@rules_nodejs//nodejs:is_linux_amd64": "@nodejs_linux_amd64//:node_bin",
"@rules_nodejs//nodejs:is_linux_ppc64le": "@nodejs_linux_ppc64le//:node_bin",
"@rules_nodejs//nodejs:is_windows_amd64": "@nodejs_windows_amd64//:node_bin",
"//conditions:default": "@nodejs_linux_amd64//:node_bin",
}),
visibility = ["//visibility:public"],
Expand Down

0 comments on commit e505480

Please sign in to comment.