Skip to content

Commit 56ec32b

Browse files
authored
build: switch to chromium provided in dev-infra package (angular#19725)
Switches the chromium version provided in the shared dev-infra package. This gives us better control over used versions, and we get RBE optimizations that have been applied to these browsers. This is a duplicate of angular#19565 that has been accidentally reverted as a patch-only PR has been merged into `master`. See: angular@d15f19e
1 parent 5d50ec7 commit 56ec32b

File tree

3 files changed

+17
-10
lines changed

3 files changed

+17
-10
lines changed

WORKSPACE

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,10 @@ web_test_repositories()
8888
load("@io_bazel_rules_webtesting//web/versioned:browsers-0.3.2.bzl", "browser_repositories")
8989

9090
browser_repositories(
91-
chromium = True,
91+
# Chrome is brought in by `@npm_dev_infra_private` for better version control and
92+
# RBE experience where individual browser archives per platform are provided.
93+
# TODO: Do the same for Firefox (but it is not used for local development): DEV-114
94+
chromium = False,
9295
firefox = True,
9396
)
9497

scripts/run-component-tests.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ if (local && (components.length > 1 || all)) {
6161
process.exit(1);
6262
}
6363

64-
const browserName = firefox ? 'firefox-local' : 'chromium-local';
64+
const browserName = firefox ? 'firefox-local' : 'chromium';
6565
const bazelBinary = `yarn -s ${watch ? 'ibazel' : 'bazel'}`;
6666
const configFlag = viewEngine ? '--config=view-engine' : '';
6767

tools/defaults.bzl

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,16 @@ def karma_web_test_suite(name, **kwargs):
159159
kwargs["srcs"] = ["@npm//:node_modules/tslib/tslib.js"] + getAngularUmdTargets() + kwargs.get("srcs", [])
160160
kwargs["deps"] = ["//tools/rxjs:rxjs_umd_modules"] + kwargs.get("deps", [])
161161

162+
# Set up default browsers if no explicit `browsers` have been specified.
163+
if not hasattr(kwargs, "browsers"):
164+
kwargs["tags"] = ["native"] + kwargs.get("tags", [])
165+
kwargs["browsers"] = [
166+
# Note: when changing the browser names here, also update the "yarn test"
167+
# script to reflect the new browser names.
168+
"@npm_angular_dev_infra_private//browsers:chromium",
169+
"@io_bazel_rules_webtesting//browsers:firefox-local",
170+
]
171+
162172
for opt_name in kwargs.keys():
163173
# Filter out options which are specific to "karma_web_test" targets. We cannot
164174
# pass options like "browsers" to the local web test target.
@@ -194,10 +204,11 @@ def karma_web_test_suite(name, **kwargs):
194204
def protractor_web_test_suite(flaky = True, **kwargs):
195205
_protractor_web_test_suite(
196206
flaky = flaky,
207+
browsers = ["@npm_angular_dev_infra_private//browsers:chromium"],
197208
**kwargs
198209
)
199210

200-
def ng_web_test_suite(deps = [], static_css = [], bootstrap = [], tags = [], **kwargs):
211+
def ng_web_test_suite(deps = [], static_css = [], bootstrap = [], **kwargs):
201212
# Always include a prebuilt theme in the test suite because otherwise tests, which depend on CSS
202213
# that is needed for measuring, will unexpectedly fail. Also always adding a prebuilt theme
203214
# reduces the amount of setup that is needed to create a test suite Bazel target. Note that the
@@ -241,12 +252,6 @@ def ng_web_test_suite(deps = [], static_css = [], bootstrap = [], tags = [], **k
241252
deps = [
242253
"//test:angular_test_init",
243254
] + deps,
244-
browsers = [
245-
# Note: when changing the browser names here, also update the "yarn test"
246-
# script to reflect the new browser names.
247-
"@io_bazel_rules_webtesting//browsers:chromium-local",
248-
"@io_bazel_rules_webtesting//browsers:firefox-local",
249-
],
250255
bootstrap = [
251256
# This matches the ZoneJS bundles used in default CLI projects. See:
252257
# https://github.com/angular/angular-cli/blob/master/packages/schematics/angular/application/files/src/polyfills.ts.template#L58
@@ -260,6 +265,5 @@ def ng_web_test_suite(deps = [], static_css = [], bootstrap = [], tags = [], **k
260265
"@npm//:node_modules/zone.js/dist/zone-testing.js",
261266
"@npm//:node_modules/reflect-metadata/Reflect.js",
262267
] + bootstrap,
263-
tags = ["native"] + tags,
264268
**kwargs
265269
)

0 commit comments

Comments
 (0)