Skip to content

Commit 78d3746

Browse files
filipesilvadgp1130
authored andcommitted
ci: run ngcc on flakey tests too
(cherry picked from commit 5707885)
1 parent bbd58c9 commit 78d3746

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,8 +250,8 @@ jobs:
250250
steps:
251251
- custom_attach_workspace
252252
- run: yarn webdriver-update
253-
- run: yarn test-large --full --flakey
254253
- run: yarn test-large --full --flakey --ve
254+
- run: yarn test-large --full --flakey
255255

256256
build-bazel:
257257
executor: action-executor

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@
3939
"validate-commits": "./bin/devkit-admin validate-commits",
4040
"preinstall": "node ./tools/yarn/check-yarn.js",
4141
"//webdriver-update-README": "ChromeDriver version must match Puppeteer Chromium version, see https://github.com/GoogleChrome/puppeteer/releases http://chromedriver.chromium.org/downloads",
42-
"webdriver-update": "webdriver-manager update --standalone false --gecko false --versions.chrome 79.0.3945.16"
42+
"webdriver-update": "webdriver-manager update --standalone false --gecko false --versions.chrome 79.0.3945.16",
43+
"ngcc": "ngcc --properties es2015 browser module main --first-only --create-ivy-entry-points"
4344
},
4445
"repository": {
4546
"type": "git",

scripts/test.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,11 @@ export default function(args: ParsedArgs, logger: logging.Logger) {
9292
if (args['ve']) {
9393
// tslint:disable-next-line:no-console
9494
console.warn('********* VE Enabled ***********');
95-
} else if (args.shard !== undefined) {
95+
} else {
9696
// CI is really flaky with NGCC
9797
// This is a working around test order and isolation issues.
98-
execSync('./node_modules/.bin/ngcc', { stdio: 'inherit' });
98+
console.warn('********* Running ngcc ***********');
99+
execSync('yarn ngcc', { stdio: 'inherit' });
99100
}
100101

101102
if (args.large) {

0 commit comments

Comments
 (0)