cargdev/angular
1
0
Fork 0
Code Issues 7 Pull Requests Actions Packages Projects Releases Wiki Activity

build: remove ivy build/test tag hackery now that we can (#26735) (#26788)

Browse Source 
With https://github.com/bazelbuild/rules_nodejs/pull/388 fixed we can stop messing around
with tags and just rely on the explicitly defined tags.

PR Close #26735

PR Close #26788
This commit is contained in:
Igor Minar
2018-10-24 18:15:46 -07:00
committed by Matias Niemelä
parent 2f3308e4f0
commit c63bc02846
4 changed files with 17 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
tools/defaults.bzl
View File

@ -44,7 +44,7 @@ PKG_GROUP_REPLACEMENTS = {
]""" % ",\n ".join(["\"%s\"" % s for s in ANGULAR_SCOPED_PACKAGES]),
}
def ts_library(tsconfig = None, testonly = False, deps = [], tags = [], **kwargs):
def ts_library(tsconfig = None, testonly = False, deps = [], **kwargs):
"""Default values for ts_library"""
deps = deps + ["@ngdeps//tslib"]
if testonly:
@ -62,11 +62,10 @@ def ts_library(tsconfig = None, testonly = False, deps = [], tags = [], **kwargs
testonly = testonly,
deps = deps,
node_modules = _DEFAULT_TS_TYPINGS,
tags = ivy_tags(tags),
**kwargs
)
def ng_module(name, tsconfig = None, entry_point = None, testonly = False, deps = [], tags = [], **kwargs):
def ng_module(name, tsconfig = None, entry_point = None, testonly = False, deps = [], **kwargs):
"""Default values for ng_module"""
deps = deps + ["@ngdeps//tslib"]
if testonly:
@ -90,7 +89,6 @@ def ng_module(name, tsconfig = None, entry_point = None, testonly = False, deps
compiler = _INTERNAL_NG_MODULE_COMPILER,
ng_xi18n = _INTERNAL_NG_MODULE_XI18N,
node_modules = _DEFAULT_TS_TYPINGS,
tags = ivy_tags(tags),
**kwargs
)
@ -152,7 +150,7 @@ def npm_package(name, replacements = {}, **kwargs):
**kwargs
)
def ts_web_test_suite(bootstrap = [], deps = [], tags = [], **kwargs):
def ts_web_test_suite(bootstrap = [], deps = [], **kwargs):
"""Default values for ts_web_test_suite"""
if not bootstrap:
bootstrap = ["//:web_test_bootstrap_scripts"]
@ -175,7 +173,6 @@ def ts_web_test_suite(bootstrap = [], deps = [], tags = [], **kwargs):
# "@io_bazel_rules_webtesting//browsers:firefox-local",
# TODO(alexeagle): add remote browsers on SauceLabs
],
tags = ivy_tags(tags),
**kwargs
)
@ -188,7 +185,7 @@ def nodejs_binary(data = [], **kwargs):
**kwargs
)
def jasmine_node_test(deps = [], tags = [], **kwargs):
def jasmine_node_test(deps = [], **kwargs):
"""Default values for jasmine_node_test"""
deps = deps + [
# Very common dependencies for tests
@ -204,7 +201,6 @@ def jasmine_node_test(deps = [], tags = [], **kwargs):
]
_jasmine_node_test(
deps = deps,
tags = ivy_tags(tags),
# Pass-thru --define=compile=foo as an environment variable
configuration_env_vars = ["compile"],
**kwargs
@ -219,16 +215,3 @@ def ng_rollup_bundle(deps = [], **kwargs):
deps = deps,
**kwargs
)
def ivy_tags(tags):
"""Sets inclusive ivy-jit and ivy-local tags"""
# Set the tags by default unless no-ivy-jit, no-ivy-aot, fixme-ivy-jit, or fixme-ivy-aot were specified.
# We should remove this and use only explicitly defined tags once https://github.com/bazelbuild/rules_nodejs/pull/388 is fixed.
if not tags:
tags = ["ivy-jit", "ivy-aot"]
elif "no-ivy-jit" not in tags and "fixme-ivy-jit" not in tags:
tags = tags + ["ivy-jit"]
elif "no-ivy-aot" not in tags and "fixme-ivy-aot" not in tags:
tags = tags + ["ivy-aot"]
return tags