From 612a43aaa9cd8435c4165a7d2ebd5bc44838a0da Mon Sep 17 00:00:00 2001
From: chris48s <chris48s@users.noreply.github.com>
Date: Thu, 30 Apr 2020 21:33:59 +0100
Subject: [PATCH] Update test matrix and docs (#4992)

* update test matrix

* update docs
---
 .circleci/config.yml     | 47 ++++++++++++++++++++--------------------
 badge-maker/CHANGELOG.md |  1 +
 doc/TUTORIAL.md          |  2 +-
 doc/self-hosting.md      |  2 +-
 4 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1938d69d82..5ab2784b34 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -109,6 +109,7 @@ package_steps: &package_steps
           export NVM_DIR="/opt/circleci/.nvm"
           [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
           nvm install v12
+          nvm install v14
           nvm use v12
           npm install -g npm
           npm ci
@@ -118,14 +119,6 @@ package_steps: &package_steps
     # Run the package tests on each currently supported node version. See:
     # https://github.com/badges/shields/blob/master/badge-maker/README.md#node-version-support
 
-    - run:
-        <<: *run_package_tests
-        environment:
-          mocha_reporter: mocha-junit-reporter
-          MOCHA_FILE: junit/badge-maker/v8/results.xml
-          NODE_VERSION: v8
-        name: Run package tests on Node 8
-
     - run:
         <<: *run_package_tests
         environment:
@@ -142,13 +135,21 @@ package_steps: &package_steps
           NODE_VERSION: v12
         name: Run package tests on Node 12
 
+    - run:
+        <<: *run_package_tests
+        environment:
+          mocha_reporter: mocha-junit-reporter
+          MOCHA_FILE: junit/badge-maker/v14/results.xml
+          NODE_VERSION: v14
+        name: Run package tests on Node 14
+
     - store_test_results:
         path: junit
 
 jobs:
   npm-install:
     docker:
-      - image: circleci/node:8
+      - image: circleci/node:10
     steps:
       - checkout
 
@@ -160,33 +161,33 @@ jobs:
 
   main:
     docker:
-      - image: circleci/node:8
+      - image: circleci/node:10
 
     <<: *main_steps
 
-  main@node-latest:
+  main@node-12:
     docker:
-      - image: circleci/node:latest
+      - image: circleci/node:12
 
     <<: *main_steps
 
   integration:
     docker:
-      - image: circleci/node:8
+      - image: circleci/node:10
       - image: redis
 
     <<: *integration_steps
 
-  integration@node-latest:
+  integration@node-12:
     docker:
-      - image: circleci/node:latest
+      - image: circleci/node:12
       - image: redis
 
     <<: *integration_steps
 
   danger:
     docker:
-      - image: circleci/node:8
+      - image: circleci/node:10
     steps:
       - checkout
 
@@ -206,7 +207,7 @@ jobs:
 
   frontend:
     docker:
-      - image: circleci/node:8
+      - image: circleci/node:10
     steps:
       - checkout
 
@@ -247,13 +248,13 @@ jobs:
 
   services:
     docker:
-      - image: circleci/node:8
+      - image: circleci/node:10
 
     <<: *services_steps
 
-  services@node-latest:
+  services@node-12:
     docker:
-      - image: circleci/node:latest
+      - image: circleci/node:12
 
     <<: *services_steps
 
@@ -308,11 +309,11 @@ workflows:
           filters:
             branches:
               ignore: gh-pages
-      - main@node-latest:
+      - main@node-12:
           filters:
             branches:
               ignore: gh-pages
-      - integration@node-latest:
+      - integration@node-12:
           filters:
             branches:
               ignore: gh-pages
@@ -330,7 +331,7 @@ workflows:
               ignore:
                 - master
                 - gh-pages
-      - services@node-latest:
+      - services@node-12:
           filters:
             branches:
               ignore:
diff --git a/badge-maker/CHANGELOG.md b/badge-maker/CHANGELOG.md
index 7701d5e4fa..ef2702077a 100644
--- a/badge-maker/CHANGELOG.md
+++ b/badge-maker/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Breaking Changes
 
+- Dropped support for node < 10
 - Package name has changed to `badge-maker` and moved to https://www.npmjs.com/package/badge-maker
 - `BadgeFactory` class is removed and replaced by `makeBadge()` function.
 - Deprecated parameters have been removed. In version 2.2.0 the `colorA`, `colorB` and `colorscheme` params were deprecated. In version 3.0.0 these have been removed.
diff --git a/doc/TUTORIAL.md b/doc/TUTORIAL.md
index 297e718dcb..bfb028bc4c 100644
--- a/doc/TUTORIAL.md
+++ b/doc/TUTORIAL.md
@@ -25,7 +25,7 @@ and learn about the [Github workflow](http://try.github.io/).
 
 #### Node, NPM
 
-Node 8 or later is required. If you don't already have them,
+Node 10 or later is required. If you don't already have them,
 install node and npm: https://nodejs.org/en/download/
 
 ### Setup a dev install
diff --git a/doc/self-hosting.md b/doc/self-hosting.md
index 20e120775b..e45516b415 100644
--- a/doc/self-hosting.md
+++ b/doc/self-hosting.md
@@ -2,7 +2,7 @@
 
 ## Installation
 
-You will need Node 8 or later, which you can install using a
+You will need Node 10 or later, which you can install using a
 [package manager][].
 
 On Ubuntu / Debian: