Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ orbs:
## IMPORTANT
# Windows needs its own cache key because binaries in node_modules are different.
# See https://circleci.com/docs/2.0/caching/#restoring-cache for how prefixes work in CircleCI.
var_1: &cache_key v1-angular_devkit-12.18-{{ checksum "yarn.lock" }}
var_1_win: &cache_key_win v1-angular_devkit-win-12.18-{{ checksum "yarn.lock" }}
var_3: &default_nodeversion "12.18"
var_1: &cache_key v1-angular_devkit-14.15-{{ checksum "yarn.lock" }}
var_1_win: &cache_key_win v1-angular_devkit-win-14.15-{{ checksum "yarn.lock" }}
var_3: &default_nodeversion "14.15"
# Workspace initially persisted by the `setup` job, and then enhanced by `setup-and-build-win`.
# https://circleci.com/docs/2.0/workflows/#using-workspaces-to-share-data-among-jobs
# https://circleci.com/blog/deep-diving-into-circleci-workspaces/
Expand Down Expand Up @@ -75,8 +75,8 @@ commands:
at: *workspace_location
setup_windows:
steps:
- run: nvm install 12.13
- run: nvm use 12.13
- run: nvm install 14.15
- run: nvm use 14.15
- run: npm install -g yarn@1.22.10
- run: node --version
- run: yarn --version
Expand Down Expand Up @@ -338,8 +338,8 @@ workflows:
- renovate/angular
- master
- e2e-cli:
name: e2e-cli-node-14
nodeversion: "14.15"
name: e2e-cli-node-12
nodeversion: "12.18"
<<: *only_release_branches
requires:
- e2e-cli
Expand Down