Merge pull request #89 from Financial-Times/nori/upgrade-node

Upgrade to Node 14/16
Financial-Times · Mar 18, 2022 · af4d3c8 · af4d3c8
2 parents 3b7c8c8 + 68b53fe
commit af4d3c8
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 10 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -7,7 +7,11 @@ references:
     &container_config_node
     working_directory: ~/project/build
     docker:
-      - image: cimg/node:12.22-browsers
+      - image: cimg/node:<< parameters.node-version >>-browsers
+    parameters:
+      node-version:
+        default: "16.14"
+        type: string
 
   workspace_root: &workspace_root ~/project
 
@@ -140,26 +144,42 @@ workflows:
       - build:
           filters:
             <<: *filters_ignore_tags_renovate_nori
+          name: build-v<< matrix.node-version >>
+          matrix:
+            parameters:
+              node-version: [ "16.14", "14.19" ]
       - test:
           requires:
-            - build
+            - build-v<< matrix.node-version >>
+          name: test-v<< matrix.node-version >>
+          matrix:
+            parameters:
+              node-version: [ "16.14", "14.19" ]
 
   build-test-publish:
     jobs:
       - build:
           filters:
             <<: *filters_version_tag
+          name: build-v<< matrix.node-version >>
+          matrix:
+            parameters:
+              node-version: [ "16.14", "14.19" ]
       - test:
           filters:
             <<: *filters_version_tag
           requires:
-            - build
+            - build-v<< matrix.node-version >>
+          name: test-v<< matrix.node-version >>
+          matrix:
+            parameters:
+              node-version: [ "16.14", "14.19" ]
       - publish:
           context: npm-publish-token
           filters:
             <<: *filters_version_tag
           requires:
-            - test
+            - test-v16.14
 
   renovate-nori-build-test:
     jobs:
@@ -170,9 +190,17 @@ workflows:
       - build:
           requires:
             - waiting-for-approval
+          name: build-v<< matrix.node-version >>
+          matrix:
+            parameters:
+              node-version: [ "16.14", "14.19" ]
       - test:
           requires:
-            - build
+            - build-v<< matrix.node-version >>
+          name: test-v<< matrix.node-version >>
+          matrix:
+            parameters:
+              node-version: [ "16.14", "14.19" ]
 
   nightly:
     triggers:
@@ -183,10 +211,18 @@ workflows:
     jobs:
       - build:
           context: next-nightly-build
+          name: build-v<< matrix.node-version >>
+          matrix:
+            parameters:
+              node-version: [ "16.14", "14.19" ]
       - test:
           requires:
-            - build
+            - build-v<< matrix.node-version >>
           context: next-nightly-build
+          name: test-v<< matrix.node-version >>
+          matrix:
+            parameters:
+              node-version: [ "16.14", "14.19" ]
 
 notify:
   webhooks:

diff --git a/.github/settings.yml b/.github/settings.yml
@@ -6,7 +6,8 @@ branches:
       required_status_checks:
         strict: true
         contexts:
-          - 'ci/circleci: build'
+          - 'ci/circleci: build-v14.19'
+          - 'ci/circleci: build-v16.14'
       enforce_admins: true
       restrictions:
         users: []

diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-12
+16
diff --git a/package.json b/package.json
@@ -23,7 +23,7 @@
     "webpack": "^2.2.1"
   },
   "engines": {
-    "node": "12.x",
+    "node": "14.x || 16.x",
     "npm": "7.x || 8.x"
   },
   "scripts": {
@@ -38,7 +38,7 @@
     }
   },
   "volta": {
-    "node": "12.22.5",
+    "node": "16.14.1",
     "npm": "7.20.2"
   }
 }