From 79bfc6371c3842835cb49c3c03edc39e1ae8a893 Mon Sep 17 00:00:00 2001 From: Dustin Deus Date: Wed, 25 Apr 2018 11:01:39 +0200 Subject: [PATCH] support nodejs 10 and update appveyor matrix --- .appveyor.yml | 31 ++++++++++++++++++++----------- .travis.yml | 1 + 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 7ab1f9c22..67c40d5b2 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -4,6 +4,15 @@ os: Visual Studio 2015 environment: matrix: + - nodejs_version: '10' + platform: x64 + msvs_toolset: 12 + - nodejs_version: '9' + platform: x64 + msvs_toolset: 12 + - nodejs_version: '8' + platform: x64 + msvs_toolset: 12 - nodejs_version: '6' platform: x64 msvs_toolset: 12 @@ -31,22 +40,22 @@ init: install: - ps: Install-Product node $env:nodejs_version $env:Platform - ps: Set-ExecutionPolicy Unrestricted -Scope CurrentUser -Force - - npm config get + #- npm config get # upgrade node-gyp to dodge https://github.com/mapbox/node-pre-gyp/issues/209#issuecomment-307641388 # and allow make node 4.x x86 builds work # https://github.com/mapbox/node-pre-gyp/issues/209#issuecomment-217690537 - - IF "%nodejs_version:~0,1%"=="4" npm install node-gyp@3.x - - node --version - - npm --version - - node -e "console.log(process.arch);" - - IF /I "%PLATFORM%" == "x64" set PATH=C:\Python27-x64;%PATH% - - IF /I "%PLATFORM%" == "x86" SET PATH=C:\python27;%PATH% - - IF /I "%PLATFORM%" == "x64" CALL "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64 - - IF /I "%PLATFORM%" == "x86" CALL "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86 + #- IF "%nodejs_version:~0,1%"=="4" npm install node-gyp@3.x + #- node --version + #- npm --version + #- node -e "console.log(process.arch);" + #- IF /I "%PLATFORM%" == "x64" set PATH=C:\Python27-x64;%PATH% + #- IF /I "%PLATFORM%" == "x86" SET PATH=C:\python27;%PATH% + #- IF /I "%PLATFORM%" == "x64" CALL "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64 + #- IF /I "%PLATFORM%" == "x86" CALL "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86 # Install gnats - - appveyor DownloadFile https://github.com/nats-io/gnatsd/releases/download/v1.0.2/gnatsd-v1.0.2-windows-386.zip - - 7z e gnatsd-v1.0.2-windows-386.zip gnatsd.exe -r -oc:\projects\hemera\build + - appveyor DownloadFile https://github.com/nats-io/gnatsd/releases/download/v1.0.4/gnatsd-v1.0.4-windows-386.zip + - 7z e gnatsd-v1.0.4-windows-386.zip gnatsd.exe -r -oc:\projects\hemera\build - cmd: set PATH=%PATH%;C:\projects\hemera\build - npm run setup diff --git a/.travis.yml b/.travis.yml index 19ea1c88c..74809db85 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ language: node_js node_js: + - "10" - "9" - "8" - "6"