ci: update CircleCI to 2.1, NodeJS to 14.15.1

- remove CI runs against AngularJS 1.5.x and 1.6.x
- migrate away from previous style of post checkout steps
- change job names to pass new schema formatting rules

Author: Splaktar

.circleci/config.yml

@@ -1,5 +1,4 @@
 # Configuration file for https://circleci.com/gh/angular/material
-# TODO: Remove testing against AngularJS 1.5.x and 1.6.x in 1.2.0.
 
 # Note: YAML anchors allow an object to be re-used, reducing duplication.
 # The ampersand declares an alias for an object, then later the `<<: *name`
@@ -8,7 +7,7 @@
 # To validate changes, use an online parser, eg. http://yaml-online-parser.appspot.com/
 
 # Find the latest version here: https://github.com/CircleCI-Public/circleci-dockerfiles/tree/master/node/images
-var_1: &docker_image circleci/node:14.4.0-browsers
+var_1: &docker_image circleci/node:14.15.1-browsers
 var_2: &cache_key angularjs-material-{{ checksum "package-lock.json" }}
 
 # Settings common to each job
@@ -17,23 +16,15 @@ var_3: &job_defaults
   docker:
     - image: *docker_image
 
-# Job step for checking out the source code from GitHub. This also ensures that the source code
-# is rebased on top of master.
-var_4: &checkout_code
-  checkout:
-    # After checkout, rebase on top of master. By default, PRs are not rebased on top of master,
-    # which we want. See https://discuss.circleci.com/t/1662
-    post: git pull --ff-only origin "refs/pull/${CIRCLE_PULL_REQUEST//*pull\//}/merge"
-
 # Restores the cache that could be available for the current lock file. The cache
 # includes the node modules.
-var_5: &restore_cache
+var_4: &restore_cache
   restore_cache:
     key: *cache_key
 
 # Saves the cache for the current lock file. We store the node modules cache in order to make
 #  subsequent builds faster.
-var_6: &save_cache
+var_5: &save_cache
   save_cache:
     key: *cache_key
     paths:
@@ -45,28 +36,39 @@ var_6: &save_cache
 # NPM with the frozen lockfile option in order to make sure that lock file and package.json are
 # in sync. Unlike in Travis, we don't need to manually purge the node modules if stale because
 # CircleCI automatically discards the cache if the checksum of the lock file has changed.
-var_7: &npm_install
+var_6: &npm_install
   run: npm ci
 
-var_8: &rebuild_node_sass
+var_7: &rebuild_node_sass
   run: npm rebuild node-sass
 
-var_9: &store_junit_test_results
+var_8: &store_junit_test_results
   store_test_results:
     path: ./artifacts/junit
 
 # Branch filter that we can specify for jobs that should only run on publish branches. This filter
 # is used to ensure that not all upstream branches will be published as Github builds
 # (e.g. revert branches, feature branches)
-var_10: &publish_branches_filter
+var_9: &publish_branches_filter
   branches:
     only:
       - master
 
 # -----------------------------
 # Container version of CircleCI
 # -----------------------------
-version: 2
+version: 2.1
+
+commands:
+  # Command for checking out the source code from GitHub. This also ensures that the source code
+  # is rebased on top of master.
+  checkout_and_rebase:
+    description: Checkout and rebase the repository
+    steps:
+      - checkout
+      # After checkout, rebase on top of master. By default, PRs are not rebased on top of master,
+      # which we want. See https://discuss.circleci.com/t/1662
+      - run: git pull --ff-only origin "refs/pull/${CIRCLE_PULL_REQUEST//*pull\//}/merge"
 
 # -----------------------------------------------------------------------------------------
 # Job definitions. Jobs which are defined just here, will not run automatically. Each job
@@ -80,7 +82,7 @@ jobs:
   lint:
     <<: *job_defaults
     steps:
-      - *checkout_code
+      - checkout_and_rebase
       - *restore_cache
       - *npm_install
       - *rebuild_node_sass
@@ -92,7 +94,7 @@ jobs:
   build:
     <<: *job_defaults
     steps:
-      - *checkout_code
+      - checkout_and_rebase
       - *restore_cache
       - *npm_install
       - *rebuild_node_sass
@@ -103,45 +105,23 @@ jobs:
   # Jobs that run the unit tests on locally installed browsers (Chrome and Firefox headless).
   # The available browsers are included in the Docker image.
   # ------------------------------------------------------------------------------------------
-  test_angularjs_1.5:
-    <<: *job_defaults
-    environment:
-      NG_VERSION: "1.5"
-    steps:
-      - *checkout_code
-      - *restore_cache
-      - *npm_install
-      - run: ./scripts/circleci/run-tests.sh
-      - *store_junit_test_results
-
-  test_angularjs_1.6:
-    <<: *job_defaults
-    environment:
-      NG_VERSION: "1.6"
-    steps:
-      - *checkout_code
-      - *restore_cache
-      - *npm_install
-      - run: ./scripts/circleci/run-tests.sh
-      - *store_junit_test_results
-
-  test_angularjs_1.7:
+  test_angularjs_1_7:
     <<: *job_defaults
     environment:
       NG_VERSION: "1.7"
     steps:
-      - *checkout_code
+      - checkout_and_rebase
       - *restore_cache
       - *npm_install
       - run: ./scripts/circleci/run-tests.sh
       - *store_junit_test_results
 
-  test_angularjs_1.8:
+  test_angularjs_1_8:
     <<: *job_defaults
     environment:
       NG_VERSION: "1.8"
     steps:
-      - *checkout_code
+      - checkout_and_rebase
       - *restore_cache
       - *npm_install
       - run: ./scripts/circleci/run-tests.sh
@@ -152,7 +132,7 @@ jobs:
     environment:
       NG_VERSION: "snapshot"
     steps:
-      - *checkout_code
+      - checkout_and_rebase
       - *restore_cache
       - *npm_install
       - run: ./scripts/circleci/run-tests.sh
@@ -164,7 +144,7 @@ jobs:
   update_and_snapshot_docs:
     <<: *job_defaults
     steps:
-      - *checkout_code
+      - checkout_and_rebase
       - *restore_cache
       - *npm_install
       - run: sudo npm i -g [email protected]
@@ -188,16 +168,10 @@ workflows:
   build_and_test:
     jobs:
       - build
-      - test_angularjs_1.5:
-          requires:
-            - build
-      - test_angularjs_1.6:
-          requires:
-            - build
-      - test_angularjs_1.7:
+      - test_angularjs_1_7:
           requires:
             - build
-      - test_angularjs_1.8:
+      - test_angularjs_1_8:
           requires:
             - build
       - test_angularjs_snapshot:
@@ -206,8 +180,6 @@ workflows:
       - update_and_snapshot_docs:
             filters: *publish_branches_filter
             requires:
-              - test_angularjs_1.5
-              - test_angularjs_1.6
-              - test_angularjs_1.7
-              - test_angularjs_1.8
+              - test_angularjs_1_7
+              - test_angularjs_1_8
               - test_angularjs_snapshot

.nvmrc

@@ -1 +1 @@
-12
+14