Skip to content

Commit e11fb00

Browse files
authored
build: update to nodejs v16.14.0 and switch away from deprecated docker image (#24579)
* build: update to nodejs v16.14.0 and switch away from deprecated docker image https://discuss.circleci.com/t/legacy-convenience-image-deprecation/41034 * ci: stop using browsers image for browser test job using remote execution Tests running with remote execution do not rely on the host environemnt so we do not need the browsers image.
1 parent 5f864f1 commit e11fb00

File tree

4 files changed

+14
-17
lines changed

4 files changed

+14
-17
lines changed

.circleci/config.yml

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
# To validate changes, use an online parser, eg.
88
# http://yaml-online-parser.appspot.com/
99

10-
var_1: &docker_image circleci/node:16.10.0
11-
var_2: &docker-browser-image circleci/node:16.10.0-browsers
10+
var_1: &docker_image cimg/node:16.14.0
11+
var_2: &docker-browser-image cimg/node:16.14.0-browsers
1212

1313
# **Note**: When updating the beginning of the cache key, also update the cache key to match
1414
# the new cache key prefix. This allows us to take advantage of CircleCI's fallback caching.
@@ -239,10 +239,9 @@ jobs:
239239
- *slack_notify_on_failure
240240

241241
# ------------------------------------------------------------------------------------------
242-
# Job that runs the unit tests on locally installed browsers (Chrome and Firefox headless).
243-
# The available browsers are chromium and firefox
242+
# Job that runs the unit tests on Bazel-provided browsers (Chrome and Firefox headless).
244243
# ------------------------------------------------------------------------------------------
245-
tests_local_browsers:
244+
tests_browsers:
246245
<<: *job_defaults
247246
resource_class: xlarge
248247
environment:
@@ -470,11 +469,10 @@ jobs:
470469
- *slack_notify_on_failure
471470

472471
# ----------------------------------------------------------------------------
473-
# Job that runs the local browser tests against the Angular Github snapshots
472+
# Job that runs the browser tests against the Angular Github snapshots
474473
# ----------------------------------------------------------------------------
475-
snapshot_tests_local_browsers:
476-
docker:
477-
- image: *docker-browser-image
474+
snapshot_tests_browsers:
475+
<<: *job_defaults
478476
resource_class: xlarge
479477
environment:
480478
GCP_DECRYPT_TOKEN: *gcp_decrypt_token
@@ -494,8 +492,7 @@ jobs:
494492
# Job that runs all Bazel integration tests.
495493
# ----------------------------------------------------------------------------
496494
integration_tests:
497-
docker:
498-
- image: *docker-browser-image
495+
<<: *job_defaults
499496
resource_class: xlarge
500497
environment:
501498
GCP_DECRYPT_TOKEN: *gcp_decrypt_token
@@ -621,7 +618,7 @@ workflows:
621618
filters: *ignore_presubmit_branch_filter
622619
- linker_jit_test:
623620
filters: *ignore_presubmit_branch_filter
624-
- tests_local_browsers:
621+
- tests_browsers:
625622
filters: *ignore_presubmit_branch_filter
626623
- tests_browserstack:
627624
filters: *ignore_presubmit_branch_filter
@@ -648,7 +645,7 @@ workflows:
648645
requires:
649646
- lint
650647
- build_release_packages
651-
- tests_local_browsers
648+
- tests_browsers
652649

653650
# Snapshot tests workflow that is scheduled to run all specified jobs every hour.
654651
# This workflow runs various jobs against the Angular snapshot builds from Github.
@@ -657,7 +654,7 @@ workflows:
657654
# Note that we need additional jobs for the cronjob snapshot tests because there
658655
# is no easy way to detect whether a job runs inside of a cronjob or specific
659656
# workflow. See: https://circleci.com/ideas/?idea=CCI-I-295
660-
- snapshot_tests_local_browsers:
657+
- snapshot_tests_browsers:
661658
filters: *only_main_branch_filter
662659
- mdc_snapshot_test_cronjob:
663660
filters: *only_main_branch_filter

.github/angular-robot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ merge:
5656
requiredStatuses:
5757
- "ci/circleci: lint"
5858
- "ci/circleci: bazel_build"
59-
- "ci/circleci: tests_local_browsers"
59+
- "ci/circleci: tests_browsers"
6060
- "ci/circleci: tests_browserstack"
6161
- "ci/circleci: tests_saucelabs"
6262
- "ci/circleci: build_release_packages"

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
16.10.0
1+
16.14.0

WORKSPACE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ bazel_skylib_workspace()
5555
load("@build_bazel_rules_nodejs//:index.bzl", "node_repositories", "yarn_install")
5656

5757
node_repositories(
58-
node_version = "16.10.0",
58+
node_version = "16.14.0",
5959
package_json = ["//:package.json"],
6060
)
6161

0 commit comments

Comments
 (0)