Skip to content

Commit 6411128

Browse files
alan-agius4atscott
authored andcommitted
ci: update default circle ci image to cimg/node:14.17.6 (angular#43810)
With this change we update Node.js version to 14.17 which is needed because of Eslint 8. Also, we replace the legacy images `circleci/node` with the new images `cimg/node`. See: https://circleci.com/developer/images/image/cimg/node PR Close angular#43810
1 parent baf8da0 commit 6411128

File tree

6 files changed

+12
-12
lines changed

6 files changed

+12
-12
lines changed

.circleci/config.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ version: 2.1
2424
# **NOTE 2 **: If you change the cache key prefix, also sync the cache_key_fallback to match.
2525
# **NOTE 3 **: Keep the static part of the cache key as prefix to enable correct fallbacks.
2626
# See https://circleci.com/docs/2.0/caching/#restoring-cache for how prefixes work in CircleCI.
27-
var_3: &cache_key v5-angular-node-14-{{ checksum "month.txt" }}-{{ checksum ".bazelversion" }}-{{ checksum "yarn.lock" }}-{{ checksum "WORKSPACE" }}-{{ checksum "aio/yarn.lock" }}
27+
var_3: &cache_key v6-angular-node-14-{{ checksum "month.txt" }}-{{ checksum ".bazelversion" }}-{{ checksum "yarn.lock" }}-{{ checksum "WORKSPACE" }}-{{ checksum "aio/yarn.lock" }}
2828
# We invalidate the cache if the Bazel version changes because otherwise the `bazelisk` cache
2929
# folder will contain all previously used versions and ultimately cause the cache restoring to
3030
# be slower due to its growing size.
31-
var_4: &cache_key_fallback v5-angular-node-14-{{ checksum "month.txt" }}-{{ checksum ".bazelversion" }}
31+
var_4: &cache_key_fallback v6-angular-node-14-{{ checksum "month.txt" }}-{{ checksum ".bazelversion" }}
3232

3333
# Windows needs its own cache key because binaries in node_modules are different.
34-
var_3_win: &cache_key_win v5-angular-win-node-14-{{ checksum "month.txt" }}-{{ checksum ".bazelversion" }}-{{ checksum "yarn.lock" }}-{{ checksum "WORKSPACE" }}-{{ checksum "aio/yarn.lock" }}
35-
var_4_win: &cache_key_win_fallback v5-angular-win-node-14-{{ checksum "month.txt" }}-{{ checksum ".bazelversion" }}
34+
var_3_win: &cache_key_win v6-angular-win-node-14-{{ checksum "month.txt" }}-{{ checksum ".bazelversion" }}-{{ checksum "yarn.lock" }}-{{ checksum "WORKSPACE" }}-{{ checksum "aio/yarn.lock" }}
35+
var_4_win: &cache_key_win_fallback v6-angular-win-node-14-{{ checksum "month.txt" }}-{{ checksum ".bazelversion" }}
3636

3737
# Cache key for the `components-repo-unit-tests` job. **Note** when updating the SHA in the
3838
# cache keys also update the SHA for the "COMPONENTS_REPO_COMMIT" environment variable.
@@ -86,7 +86,7 @@ executors:
8686
type: string
8787
default: medium
8888
docker:
89-
- image: circleci/node:14.16.1@sha256:951e12268fe692615bfd155c327bd910e10c99db98404badd03879f984c32b31
89+
- image: cimg/node:14.17.6@sha256:589b5e494173bfb48923fa8d29b010b4d17079ac98d08de95dd4a78e57f5aa0b
9090
resource_class: << parameters.resource_class >>
9191
working_directory: ~/ng
9292

@@ -131,7 +131,7 @@ commands:
131131
# and network security service libraries (libnss3) & X11 Screen Saver extension library (libssx1)
132132
# which are dependencies of chrome & needed for karma & protractor headless chrome tests.
133133
# This is a very small install which takes around 7s in comparing to using the full
134-
# circleci/node:x.x.x-browsers image.
134+
# cimg/node:x.x.x-browsers image.
135135
sudo apt-get -y install libgtk-3-0 libasound2 libnss3 libxss1
136136
137137
# Install java runtime which is required by some integration tests such as

.circleci/windows-env.ps1

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ copy .circleci\bazel.windows.rc ${Env:USERPROFILE}\.bazelrc
4141
####################################################################################################
4242
# Install specific version of node.
4343
####################################################################################################
44-
nvm install 14.16.1
45-
nvm use 14.16.1
44+
nvm install 14.17.6
45+
nvm use 14.17.6
4646

4747
# These Bazel prereqs aren't needed because the CircleCI image already includes them.
4848
# choco install yarn --version 1.16.0 --no-progress

.devcontainer/recommended-Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Image metadata and config.
22
# Ideally, the Node.js version should match what we use on CI.
33
# See `executors > default-executor` in `.circleci/config.yml`.
4-
FROM circleci/node:14-browsers
4+
FROM cimg/node:14-browsers
55

66

77
LABEL name="Angular dev environment" \

.nvmrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
14.16.1
1+
14.17.6

WORKSPACE

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ check_rules_nodejs_version(minimum_version_string = "2.2.0")
3232

3333
# Setup the Node.js toolchain
3434
node_repositories(
35-
node_version = "14.16.1",
35+
node_version = "14.17.6",
3636
package_json = ["//:package.json"],
3737
)
3838

integration/bazel/WORKSPACE

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ load("@build_bazel_rules_nodejs//:index.bzl", "node_repositories", "yarn_install
2626
# Setup the Node.js toolchain
2727
node_repositories(
2828
# Use same node version as root angular WORKSPACE since
29-
node_version = "14.16.1",
29+
node_version = "14.17.6",
3030
yarn_version = "1.12.1",
3131
)
3232

0 commit comments

Comments
 (0)