Skip to content

Commit d15f19e

Browse files
devversionandrewseguin
authored andcommitted
build: fix ci failures in patch branch (#19607)
* Revert "build: switch to chromium provided in dev-infra package (#19565)" This reverts commit b4d0852. * Revert "fix(material-experimental/mdc-menu): missing padding after latest canary release (#19548)" This reverts commit 771b4ba. This has been accidentally merged into the patch branch, where the MDC version has not been updated yet.
1 parent 0d266e2 commit d15f19e

File tree

4 files changed

+10
-19
lines changed

4 files changed

+10
-19
lines changed

WORKSPACE

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

9090
browser_repositories(
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,
91+
chromium = True,
9592
firefox = True,
9693
)
9794

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

src/material-experimental/mdc-menu/menu.scss

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@
3838
// Note that we include this private mixin, because the public
3939
// one adds a bunch of styles that we aren't using for the menu.
4040
@include mdc-list-item-base_;
41-
@include mdc-list-list-item-padding-variant(
42-
$mdc-list-textual-variant-config, $query: $mat-base-styles-query);
4341

4442
// MDC's menu items are `<li>` nodes which don't need resets, however ours
4543
// can be anything, including buttons, so we need to do the reset ourselves.

tools/defaults.bzl

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -159,16 +159,6 @@ 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-
172162
for opt_name in kwargs.keys():
173163
# Filter out options which are specific to "karma_web_test" targets. We cannot
174164
# pass options like "browsers" to the local web test target.
@@ -204,11 +194,10 @@ def karma_web_test_suite(name, **kwargs):
204194
def protractor_web_test_suite(flaky = True, **kwargs):
205195
_protractor_web_test_suite(
206196
flaky = flaky,
207-
browsers = ["@npm_angular_dev_infra_private//browsers:chromium"],
208197
**kwargs
209198
)
210199

211-
def ng_web_test_suite(deps = [], static_css = [], bootstrap = [], **kwargs):
200+
def ng_web_test_suite(deps = [], static_css = [], bootstrap = [], tags = [], **kwargs):
212201
# Always include a prebuilt theme in the test suite because otherwise tests, which depend on CSS
213202
# that is needed for measuring, will unexpectedly fail. Also always adding a prebuilt theme
214203
# reduces the amount of setup that is needed to create a test suite Bazel target. Note that the
@@ -252,6 +241,12 @@ def ng_web_test_suite(deps = [], static_css = [], bootstrap = [], **kwargs):
252241
deps = [
253242
"//test:angular_test_init",
254243
] + 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+
],
255250
bootstrap = [
256251
# This matches the ZoneJS bundles used in default CLI projects. See:
257252
# https://github.com/angular/angular-cli/blob/master/packages/schematics/angular/application/files/src/polyfills.ts.template#L58
@@ -265,5 +260,6 @@ def ng_web_test_suite(deps = [], static_css = [], bootstrap = [], **kwargs):
265260
"@npm//:node_modules/zone.js/dist/zone-testing.js",
266261
"@npm//:node_modules/reflect-metadata/Reflect.js",
267262
] + bootstrap,
263+
tags = ["native"] + tags,
268264
**kwargs
269265
)

0 commit comments

Comments
 (0)