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

Upgrade Node 18
Financial-Times · Jun 30, 2023 · 2251a95 · 2251a95
2 parents 75a9cd2 + adff22d
commit 2251a95
Show file tree

Hide file tree

Showing 4 changed files with 799 additions and 486 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,7 +1,11 @@
 # CONFIG GENERATED BY DOTCOM-TOOL-KIT, DO NOT EDIT BY HAND
 version: 2.1
 orbs:
-  tool-kit: financial-times/dotcom-tool-kit@2
+  tool-kit: financial-times/dotcom-tool-kit@4
+executors:
+  node:
+    docker:
+      - image: cimg/node:16.14-browsers
 jobs:
   checkout:
     docker:
@@ -28,33 +32,50 @@ workflows:
             branches:
               only: /(^renovate-.*|^nori/.*)/
       - tool-kit/setup:
+          name: tool-kit/setup-<< matrix.executor >>
           requires:
             - checkout
             - waiting-for-approval
+          matrix:
+            parameters:
+              executor:
+                - node
           filters:
             tags:
               only: /^v\d+\.\d+\.\d+(-.+)?/
       - tool-kit/build:
+          name: tool-kit/build-<< matrix.executor >>
           requires:
-            - tool-kit/setup
+            - tool-kit/setup-<< matrix.executor >>
+          matrix:
+            parameters:
+              executor:
+                - node
           filters:
             tags:
               only: /^v\d+\.\d+\.\d+(-.+)?/
       - tool-kit/test:
+          name: tool-kit/test-<< matrix.executor >>
           requires:
-            - tool-kit/build
+            - tool-kit/build-<< matrix.executor >>
+          matrix:
+            parameters:
+              executor:
+                - node
           filters:
             tags:
               only: /^v\d+\.\d+\.\d+(-.+)?/
-      - tool-kit/publish:
-          context: npm-publish-token
+      - tool-kit/publish-tag:
           requires:
-            - tool-kit/test
+            - tool-kit/test-node
+          name: tool-kit/publish-tag-node
+          executor: node
           filters:
-            branches:
-              ignore: /.*/
             tags:
               only: /^v\d+\.\d+\.\d+(-.+)?/
+            branches:
+              ignore: /.*/
+          context: npm-publish-token
   nightly:
     when:
       and:
@@ -67,11 +88,26 @@ workflows:
     jobs:
       - checkout
       - tool-kit/setup:
+          name: tool-kit/setup-<< matrix.executor >>
           requires:
             - checkout
+          matrix:
+            parameters:
+              executor:
+                - node
       - tool-kit/build:
+          name: tool-kit/build-<< matrix.executor >>
           requires:
-            - tool-kit/setup
+            - tool-kit/setup-<< matrix.executor >>
+          matrix:
+            parameters:
+              executor:
+                - node
       - tool-kit/test:
+          name: tool-kit/test-<< matrix.executor >>
           requires:
-            - tool-kit/build
+            - tool-kit/build-<< matrix.executor >>
+          matrix:
+            parameters:
+              executor:
+                - node
diff --git a/.toolkitrc.yml b/.toolkitrc.yml
@@ -9,4 +9,3 @@ hooks:
   test:ci:
     - Eslint
     - Mocha
-