Merge pull request #125 from Financial-Times/upgrade-to-node-v12

Upgrade to Node v12
Financial-Times · Oct 2, 2020 · 8a068fa · 8a068fa
2 parents f17d841 + 7ae2c85
commit 8a068fa
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 57 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,15 +1,10 @@
 version: 2.1
 
 executors:
-    circleci-node-10:
+    circleci-node-12:
         docker:
-            - image: circleci/node:10
-        working_directory: ~/project/build-node-10
-
-    circleci-node-8:
-        docker:
-            - image: circleci/node:8
-        working_directory: ~/project/build-node-8
+            - image: circleci/node:12
+        working_directory: ~/project/build-node-12
 
 commands:
     npm-install:
@@ -47,42 +42,25 @@ references:
             ignore: /.*/
 
 jobs:
-    build-node-8:
-        executor: circleci-node-8
-        steps:
-            - checkout
-            - npm-install
-            - persist_to_workspace:
-                  root: *workspace_root
-                  paths:
-                      - build-node-8
-    build-node-10:
-        executor: circleci-node-10
+    build-node-12:
+        executor: circleci-node-12
         steps:
             - checkout
             - npm-install
             - persist_to_workspace:
                   root: *workspace_root
                   paths:
-                      - build-node-10
-
-    test-node-8:
-        executor: circleci-node-8
-        steps:
-            - *attach_workspace
-            - run:
-                  name: Run tests
-                  command: npm test
-    test-node-10:
-        executor: circleci-node-10
+                      - build-node-12
+    test-node-12:
+        executor: circleci-node-12
         steps:
             - *attach_workspace
             - run:
                   name: Run tests
                   command: npm test
 
     publish:
-        executor: circleci-node-10
+        executor: circleci-node-12
         steps:
             - *attach_workspace
             - run:
@@ -109,44 +87,27 @@ workflows:
 
     build-test:
         jobs:
-            - build-node-8:
-                  filters:
-                      <<: *filters_branch_build
-            - build-node-10:
-                  filters:
-                      <<: *filters_branch_build
-            - test-node-8:
+            - build-node-12:
                   filters:
                       <<: *filters_branch_build
-                  requires:
-                      - build-node-8
-            - test-node-10:
+            - test-node-12:
                   filters:
                       <<: *filters_branch_build
                   requires:
-                      - build-node-10
+                      - build-node-12
 
     build-test-publish:
         jobs:
-            - build-node-8:
-                  filters:
-                      <<: *filters_release_package_build
-            - build-node-10:
+            - build-node-12:
                   filters:
                       <<: *filters_release_package_build
-            - test-node-8:
-                  filters:
-                      <<: *filters_release_package_build
-                  requires:
-                      - build-node-8
-            - test-node-10:
+            - test-node-12:
                   filters:
                       <<: *filters_release_package_build
                   requires:
-                      - build-node-10
+                      - build-node-12
             - publish:
                   filters:
                       <<: *filters_release_package_build
                   requires:
-                      - test-node-8
-                      - test-node-10
+                      - test-node-12
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-8
+12
diff --git a/package.json b/package.json
@@ -36,7 +36,7 @@
 	},
 	"homepage": "https://github.com/Financial-Times/ebi#readme",
 	"engines": {
-		"node": "^8.16.0 || ^10.15.3"
+		"node": "12.x"
 	},
 	"husky": {
 		"hooks": {