Skip to content

Commit 2d338a0

Browse files
filipesilvaalexeagle
authored andcommitted
ci: only run node 10 and ng snapshots on master
1 parent 05471cc commit 2d338a0

File tree

1 file changed

+22
-28
lines changed

1 file changed

+22
-28
lines changed

.circleci/config.yml

Lines changed: 22 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,12 @@ anchor_5: &env_win
6565
# Need to install node and yarn before, as the base windows image doesn't have anything.
6666
# TODO: remove when CircleCI provides preconfigured node images/VMs.
6767
name: Setup windows node environment
68-
command: ./.circleci/windows-env.ps1
68+
command: ./.circleci/windows-env.ps1
69+
anchor_6: &ignore_pull_requests
70+
filters:
71+
branches:
72+
ignore:
73+
- /pull\/.*/
6974

7075
# Job definitions
7176
version: 2.1
@@ -172,13 +177,6 @@ jobs:
172177
resource_class: xlarge
173178
parallelism: 4
174179
steps:
175-
- run:
176-
name: Don't run expensive e2e tests for forks other than renovate-bot and angular
177-
command: >
178-
if [[ "$CIRCLE_PR_USERNAME" != "renovate-bot" ]] &&
179-
[[ "$CIRCLE_PROJECT_USERNAME" != "angular" || $CIRCLE_BRANCH != "master" ]]; then
180-
circleci step halt
181-
fi
182180
- attach_workspace: *attach_options
183181
- run: PATH=~/.npm-global/bin:$PATH xvfb-run -a node ./tests/legacy-cli/run_e2e --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX} --ng-snapshots
184182

@@ -285,47 +283,43 @@ workflows:
285283
- test:
286284
requires:
287285
- build
286+
- test-win:
287+
requires:
288+
- test
288289
- test-large:
289290
requires:
290291
- build
291292
- e2e-cli:
292293
requires:
293294
- build
294-
- e2e-cli-node-10:
295-
requires:
296-
- build
297295
- e2e-cli-ivy:
298296
requires:
299297
- build
300-
- snapshot_publish_docs:
301-
requires:
302-
- install
303-
filters:
304-
branches:
305-
only:
306-
- /docs-preview/
307298
- e2e-cli-ng-snapshots:
299+
<<: *ignore_pull_requests
308300
requires:
309-
- build
310-
- test-win:
301+
- e2e-cli
302+
- e2e-cli-node-10:
303+
<<: *ignore_pull_requests
311304
requires:
312-
- test
305+
- e2e-cli
313306
- e2e-cli-win:
307+
<<: *ignore_pull_requests
308+
requires:
309+
- e2e-cli
310+
- snapshot_publish_docs:
314311
requires:
315-
- e2e-cli
312+
- install
316313
filters:
317314
branches:
318-
ignore:
319-
- /pull\/.*/
315+
only:
316+
- /docs-preview/
320317
- snapshot_publish:
318+
<<: *ignore_pull_requests
321319
requires:
322320
- test
323321
- build
324322
- e2e-cli
325-
filters:
326-
branches:
327-
ignore:
328-
- /pull\/.*/
329323
- publish:
330324
requires:
331325
- test

0 commit comments

Comments
 (0)