From 082d9871834bee1c812f1f28e44ac8b82eb5c17d Mon Sep 17 00:00:00 2001
From: Paul Roebuck <plroebuck@users.noreply.github.com>
Date: Fri, 17 May 2019 04:57:49 -0500
Subject: [PATCH 1/4] ci(.travis.yml): Update Travis config to use Node-12

Minor changes to use Node-12. Adds couple APT packages. Updates "package-lock.json" so we can use
the prebuilt canvas package.
---
 .travis.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 2de2a30cdb..6f4e8231cc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,11 +11,15 @@ stages:
 
 # defaults
 language: node_js
-node_js: '11'
+node_js: '12'
 addons:
   apt:
     packages:
+      # Growl
       - libnotify-bin
+      # Canvas
+      - libpango1.0-dev
+      - libgif-dev
 # `nvm install` happens before the cache is restored, which means
 # we must install our own npm elsewhere (`~/npm`)
 before_install: |

From 276ca0849a0361f30478779c6cf268c92d1dfd90 Mon Sep 17 00:00:00 2001
From: Paul Roebuck <plroebuck@users.noreply.github.com>
Date: Fri, 17 May 2019 05:02:01 -0500
Subject: [PATCH 2/4] ci(appveyor.yml): Update AppVeyor config to use Node-12

Minor changes to use Node-12. As their images are not yet up-to-date, switched to alternative script
for installing Node.
---
 appveyor.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 32ed327dea..0527d3e13a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -12,7 +12,7 @@ shallow_clone: true
 clone_depth: 1
 environment:
   matrix:
-    - nodejs_version: '11'
+    - nodejs_version: '12'
     - nodejs_version: '10'
     - nodejs_version: '8'
     - nodejs_version: '6'
@@ -35,7 +35,9 @@ install:
   ## Node-related installs
   - ps: Add-AppveyorMessage "Installing Node..."
   - set PATH=%APPDATA%\npm;C:\MinGW\bin;%PATH%
-  - ps: Install-Product node $env:nodejs_version x64
+  ## :NOTE: Use slower `Update-NodeJSInstallation` until pre-installed Node-12 image available
+  #- ps: Install-Product node $env:nodejs_version $env:platform
+  - ps: Update-NodeJsInstallation (Get-NodeJsLatestBuild $env:nodejs_version) $env:platform
   - ps: Add-AppveyorMessage "Installing npm..."
   - npm install -g npm
   ## Mocha-related package installs

From 545257743c46ebc06f6ed95074a28471676315e0 Mon Sep 17 00:00:00 2001
From: Christopher Hiller <boneskull@boneskull.com>
Date: Thu, 6 Jun 2019 09:56:31 -0700
Subject: [PATCH 3/4] downgrade to node v10 for browser tests

---
 .travis.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6f4e8231cc..e6125d7d3c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,9 +17,6 @@ addons:
     packages:
       # Growl
       - libnotify-bin
-      # Canvas
-      - libpango1.0-dev
-      - libgif-dev
 # `nvm install` happens before the cache is restored, which means
 # we must install our own npm elsewhere (`~/npm`)
 before_install: |
@@ -53,6 +50,8 @@ jobs:
       node_js: '6'
 
     - script: npm start test.bundle test.browser
+      # XXX: update when canvas supplies a prebuilt binary for Node.js v12.x
+      node_js: 10
       install: npm ci # we need the native modules here
       addons:
         artifacts:

From 84ab52418fd5299128a3aeafd77f6116e86163b1 Mon Sep 17 00:00:00 2001
From: "P. Roebuck" <plroebuck@users.noreply.github.com>
Date: Wed, 12 Jun 2019 13:57:02 -0500
Subject: [PATCH 4/4] Update appveyor.yml

Future-proof install of Node versions
---
 appveyor.yml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 0527d3e13a..780466f46b 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -35,9 +35,14 @@ install:
   ## Node-related installs
   - ps: Add-AppveyorMessage "Installing Node..."
   - set PATH=%APPDATA%\npm;C:\MinGW\bin;%PATH%
-  ## :NOTE: Use slower `Update-NodeJSInstallation` until pre-installed Node-12 image available
-  #- ps: Install-Product node $env:nodejs_version $env:platform
-  - ps: Update-NodeJsInstallation (Get-NodeJsLatestBuild $env:nodejs_version) $env:platform
+  ## Prefer pre-installed Node versions, with fallback to manual update
+  - ps: |
+      try {
+      Install-Product node $env:nodejs_version $env:platform
+      } catch {
+      Add-AppveyorMessage "  install failed - attempting manual update..."
+      Update-NodeJsInstallation (Get-NodeJsLatestBuild $env:nodejs_version) $env:platform
+      }
   - ps: Add-AppveyorMessage "Installing npm..."
   - npm install -g npm
   ## Mocha-related package installs