Skip to content

Commit 1c97ad5

Browse files
committed
build: switch to chromium provided in dev-infra package
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. Closes #19543.
1 parent c05a07e commit 1c97ad5

File tree

3 files changed

+12
-8
lines changed

3 files changed

+12
-8
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: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,12 @@ def karma_web_test_suite(name, **kwargs):
158158
web_test_args = {}
159159
kwargs["srcs"] = ["@npm//:node_modules/tslib/tslib.js"] + getAngularUmdTargets() + kwargs.get("srcs", [])
160160
kwargs["deps"] = ["//tools/rxjs:rxjs_umd_modules"] + kwargs.get("deps", [])
161+
kwargs["browsers"] = kwargs.get("browsers", [
162+
# Note: when changing the browser names here, also update the "yarn test"
163+
# script to reflect the new browser names.
164+
"@npm_angular_dev_infra_private//browsers:chromium",
165+
"@io_bazel_rules_webtesting//browsers:firefox-local",
166+
])
161167

162168
for opt_name in kwargs.keys():
163169
# Filter out options which are specific to "karma_web_test" targets. We cannot
@@ -194,6 +200,7 @@ def karma_web_test_suite(name, **kwargs):
194200
def protractor_web_test_suite(flaky = True, **kwargs):
195201
_protractor_web_test_suite(
196202
flaky = flaky,
203+
browsers = ["@npm_angular_dev_infra_private//browsers:chromium"],
197204
**kwargs
198205
)
199206

@@ -241,12 +248,6 @@ def ng_web_test_suite(deps = [], static_css = [], bootstrap = [], tags = [], **k
241248
deps = [
242249
"//test:angular_test_init",
243250
] + 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-
],
250251
bootstrap = [
251252
# This matches the ZoneJS bundles used in default CLI projects. See:
252253
# https://github.com/angular/angular-cli/blob/master/packages/schematics/angular/application/files/src/polyfills.ts.template#L58

0 commit comments

Comments
 (0)