From 6aea69bfc97b439e235e7a32c7d47a1a1a6a3dbe Mon Sep 17 00:00:00 2001
From: Ivo Murrell <ivo.murrell@ft.com>
Date: Tue, 1 Mar 2022 16:28:03 +0000
Subject: [PATCH 1/2] Update to node 16 and test node 14 in the CI

---
 .circleci/config.yml | 52 +++++++++++++++++++++++++++++++++++++++-----
 package.json         |  4 ++--
 2 files changed, 48 insertions(+), 8 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5117113..efa2c5c 100644
--- 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
+      - image: cimg/node:<< parameters.node-version >>
+    parameters:
+      node-version:
+        default: "16.14"
+        type: string
 
   workspace_root: &workspace_root ~/project
 
@@ -141,26 +145,46 @@ 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-v<< matrix.node-version >>
+          name: publish-v<< matrix.node-version >>
+          matrix:
+            parameters:
+              node-version: [ "16.14", "14.19" ]
 
   renovate-nori-build-test:
     jobs:
@@ -171,9 +195,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:
@@ -184,10 +216,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/package.json b/package.json
index 4c59b2c..e9f1f16 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,7 @@
   },
   "config": {},
   "engines": {
-    "node": "12.x",
+    "node": "14.x || 16.x",
     "npm": "7.x || 8.x"
   },
   "husky": {
@@ -43,7 +43,7 @@
     }
   },
   "volta": {
-    "node": "12.22.5",
+    "node": "16.14.0",
     "npm": "7.20.2"
   }
 }

From d12114463fe0630942aa47ec11cb79dac6b3347a Mon Sep 17 00:00:00 2001
From: Ivo Murrell <ivo.murrell@ft.com>
Date: Wed, 16 Mar 2022 17:32:41 +0000
Subject: [PATCH 2/2] Only run the publish job once

---
 .circleci/config.yml | 6 +-----
 .nvmrc               | 2 +-
 package.json         | 2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index efa2c5c..4461d43 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -180,11 +180,7 @@ workflows:
           filters:
             <<: *filters_version_tag
           requires:
-            - test-v<< matrix.node-version >>
-          name: publish-v<< matrix.node-version >>
-          matrix:
-            parameters:
-              node-version: [ "16.14", "14.19" ]
+            - test-v16.14
 
   renovate-nori-build-test:
     jobs:
diff --git a/.nvmrc b/.nvmrc
index 48082f7..b6a7d89 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-12
+16
diff --git a/package.json b/package.json
index e9f1f16..3852b5e 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
     }
   },
   "volta": {
-    "node": "16.14.0",
+    "node": "16.14.1",
     "npm": "7.20.2"
   }
 }