Skip to content

build: update to nodejs v16.14.0 and switch away from deprecated docker image #24579

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 14, 2022
Merged
Show file tree
Hide file tree
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
25 changes: 11 additions & 14 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
# To validate changes, use an online parser, eg.
# http://yaml-online-parser.appspot.com/

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

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

# ------------------------------------------------------------------------------------------
# Job that runs the unit tests on locally installed browsers (Chrome and Firefox headless).
# The available browsers are chromium and firefox
# Job that runs the unit tests on Bazel-provided browsers (Chrome and Firefox headless).
# ------------------------------------------------------------------------------------------
tests_local_browsers:
tests_browsers:
<<: *job_defaults
resource_class: xlarge
environment:
Expand Down Expand Up @@ -470,11 +469,10 @@ jobs:
- *slack_notify_on_failure

# ----------------------------------------------------------------------------
# Job that runs the local browser tests against the Angular Github snapshots
# Job that runs the browser tests against the Angular Github snapshots
# ----------------------------------------------------------------------------
snapshot_tests_local_browsers:
docker:
- image: *docker-browser-image
snapshot_tests_browsers:
<<: *job_defaults
resource_class: xlarge
environment:
GCP_DECRYPT_TOKEN: *gcp_decrypt_token
Expand All @@ -494,8 +492,7 @@ jobs:
# Job that runs all Bazel integration tests.
# ----------------------------------------------------------------------------
integration_tests:
docker:
- image: *docker-browser-image
<<: *job_defaults
resource_class: xlarge
environment:
GCP_DECRYPT_TOKEN: *gcp_decrypt_token
Expand Down Expand Up @@ -621,7 +618,7 @@ workflows:
filters: *ignore_presubmit_branch_filter
- linker_jit_test:
filters: *ignore_presubmit_branch_filter
- tests_local_browsers:
- tests_browsers:
filters: *ignore_presubmit_branch_filter
- tests_browserstack:
filters: *ignore_presubmit_branch_filter
Expand All @@ -648,7 +645,7 @@ workflows:
requires:
- lint
- build_release_packages
- tests_local_browsers
- tests_browsers

# Snapshot tests workflow that is scheduled to run all specified jobs every hour.
# This workflow runs various jobs against the Angular snapshot builds from Github.
Expand All @@ -657,7 +654,7 @@ workflows:
# Note that we need additional jobs for the cronjob snapshot tests because there
# is no easy way to detect whether a job runs inside of a cronjob or specific
# workflow. See: https://circleci.com/ideas/?idea=CCI-I-295
- snapshot_tests_local_browsers:
- snapshot_tests_browsers:
filters: *only_main_branch_filter
- mdc_snapshot_test_cronjob:
filters: *only_main_branch_filter
Expand Down
2 changes: 1 addition & 1 deletion .github/angular-robot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ merge:
requiredStatuses:
- "ci/circleci: lint"
- "ci/circleci: bazel_build"
- "ci/circleci: tests_local_browsers"
- "ci/circleci: tests_browsers"
- "ci/circleci: tests_browserstack"
- "ci/circleci: tests_saucelabs"
- "ci/circleci: build_release_packages"
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16.10.0
16.14.0
2 changes: 1 addition & 1 deletion WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ bazel_skylib_workspace()
load("@build_bazel_rules_nodejs//:index.bzl", "node_repositories", "yarn_install")

node_repositories(
node_version = "16.10.0",
node_version = "16.14.0",
package_json = ["//:package.json"],
)

Expand Down