build against msvs_toolset=14 when we can

TryGhost · Dec 15, 2017 · 943da93 · 943da93
1 parent 72bddaf
commit 943da93
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 15 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -6,46 +6,36 @@ environment:
   matrix:
     - nodejs_version: 0.10
       platform: x86
-      msvs_toolset: 12
     - nodejs_version: 0.10
       platform: x64
-      msvs_toolset: 12
     - nodejs_version: 0.12
       platform: x86
-      msvs_toolset: 12
     - nodejs_version: 0.12
       platform: x64
-      msvs_toolset: 12
     - nodejs_version: 4
       platform: x64
-      msvs_toolset: 12
     - nodejs_version: 4
       platform: x86
-      msvs_toolset: 12
     - nodejs_version: 5
       platform: x64
-      msvs_toolset: 12
     - nodejs_version: 5
       platform: x86
-      msvs_toolset: 12
     - nodejs_version: 6
       platform: x64
-      msvs_toolset: 12
     - nodejs_version: 6
       platform: x86
-      msvs_toolset: 12
     - nodejs_version: 7
       platform: x64
-      msvs_toolset: 12
     - nodejs_version: 7
       platform: x86
-      msvs_toolset: 12
     - nodejs_version: 8
       platform: x64
-      msvs_toolset: 12
     - nodejs_version: 8
       platform: x86
-      msvs_toolset: 12
+    - nodejs_version: 9
+      platform: x64
+    - nodejs_version: 9
+      platform: x86
     # custom visual studio 2015 builds
     - nodejs_version: 0.10.40
       platform: x86

diff --git a/package.json b/package.json
@@ -37,7 +37,7 @@
     "url": "git://github.com/mapbox/node-sqlite3.git"
   },
   "dependencies": {
-    "nan": "~2.7.0",
+    "nan": "~2.8.0",
     "node-pre-gyp": "~0.6.38"
   },
   "bundledDependencies": [

diff --git a/scripts/build-appveyor.bat b/scripts/build-appveyor.bat
@@ -4,10 +4,14 @@ SET EL=0
 
 ECHO ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ %~f0 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+IF "%msvs_toolset%"=="" ECHO "msvs_toolset unset, defaulting to 12" && SET msvs_toolset=12
+IF %NODE_MAJOR% GTR 4 ECHO "detected >= node v5, forcing msvs_toolset=14" && SET msvs_toolset=14
+
 SET PATH=%CD%;%PATH%
 SET msvs_version=2013
 IF "%msvs_toolset%"=="14" SET msvs_version=2015
 
+
 ECHO APPVEYOR^: %APPVEYOR%
 ECHO nodejs_version^: %nodejs_version%
 ECHO platform^: %platform%
@@ -51,6 +55,7 @@ IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 
 :SKIP_APPVEYOR_INSTALL
 IF /I "%msvs_toolset%"=="12" GOTO NODE_INSTALLED
+IF %NODE_MAJOR% GTR 4 GOTO NODE_INSTALLED
 
 
 ::custom node for VS2015