From de90eba2ca76366bd42acd92b0efebd87c0dda4d Mon Sep 17 00:00:00 2001 From: Outsider Date: Tue, 23 Apr 2019 17:42:33 -0700 Subject: [PATCH 1/4] Support Node 12 instead Node 11 Signed-off-by: Outsider --- .travis.yml | 2 +- appveyor.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2de2a30cdb..808cacbd4c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ stages: # defaults language: node_js -node_js: '11' +node_js: '12' addons: apt: packages: diff --git a/appveyor.yml b/appveyor.yml index 32ed327dea..792c4409ea 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' From 778d1596adea06a2dec16845dbe9bd73ff92200c Mon Sep 17 00:00:00 2001 From: "P. Roebuck" Date: Tue, 14 May 2019 04:02:21 -0500 Subject: [PATCH 2/4] Update appveyor.yml Until pre-installed Node-12 image available, switched from `Install-Product` to slower `Update-NodeJSInstallation`. --- appveyor.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 792c4409ea..37463962e4 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -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: Using slower `Update-NodeJSInstallation` until pre-installed Node-12 image made 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 734df793462c8e86b605295cbd5b4a17db000954 Mon Sep 17 00:00:00 2001 From: "P. Roebuck" Date: Tue, 14 May 2019 04:40:06 -0500 Subject: [PATCH 3/4] Update .travis.yml for Node-12 canvas build [skip appveyor] Added `libpango` to attempt to get `canvas` to build on Node-12 for browser tests. --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 808cacbd4c..d58c101f5a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,7 @@ addons: apt: packages: - libnotify-bin + - libpango1.0-dev # `nvm install` happens before the cache is restored, which means # we must install our own npm elsewhere (`~/npm`) before_install: | From dc833e5bba4ecd631f4e315b2d6d941ecb09d665 Mon Sep 17 00:00:00 2001 From: "P. Roebuck" Date: Tue, 14 May 2019 05:13:58 -0500 Subject: [PATCH 4/4] Update .travis.yml for Node-12 canvas [skip appveyor] Try again, this time adding _all_ external libraries from its [Ubuntu installation instructions](https://github.com/Automattic/node-canvas/wiki/Installation:-Ubuntu-and-other-Debian-based-systems). --- .travis.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.travis.yml b/.travis.yml index d58c101f5a..e7e664201b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,8 +15,15 @@ node_js: '12' addons: apt: packages: + # Growl - libnotify-bin + # Canvas + - pkg-config + - libcairo2-dev - libpango1.0-dev + - libjpeg-dev + - libgif-dev + - librsvg2-dev # `nvm install` happens before the cache is restored, which means # we must install our own npm elsewhere (`~/npm`) before_install: |