Commit 864eab0a by Dane Springmeyer Committed by GitHub

Merge pull request #860 from mapbox/v8-redux

Add support for node v8 to travis+appveyor
parents f1456b1c c2a40ed9
...@@ -24,6 +24,13 @@ matrix: ...@@ -24,6 +24,13 @@ matrix:
# Linux # Linux
- os: linux - os: linux
compiler: clang compiler: clang
env: NODE_VERSION="8"
addons:
apt:
sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ]
packages: [ 'clang-3.5']
- os: linux
compiler: clang
env: NODE_VERSION="7" env: NODE_VERSION="7"
addons: addons:
apt: apt:
...@@ -78,6 +85,9 @@ matrix: ...@@ -78,6 +85,9 @@ matrix:
env: NODE_VERSION="5" COVERAGE=true PUBLISHABLE=false # node abi 47 env: NODE_VERSION="5" COVERAGE=true PUBLISHABLE=false # node abi 47
- os: osx - os: osx
compiler: clang compiler: clang
env: NODE_VERSION="8" # node abi 57
- os: osx
compiler: clang
env: NODE_VERSION="7" # node abi 51 env: NODE_VERSION="7" # node abi 51
- os: osx - os: osx
compiler: clang compiler: clang
......
...@@ -40,6 +40,12 @@ environment: ...@@ -40,6 +40,12 @@ environment:
- nodejs_version: 7 - nodejs_version: 7
platform: x86 platform: x86
msvs_toolset: 12 msvs_toolset: 12
- nodejs_version: 8
platform: x64
msvs_toolset: 12
- nodejs_version: 8
platform: x86
msvs_toolset: 12
# custom visual studio 2015 builds # custom visual studio 2015 builds
- nodejs_version: 0.10.40 - nodejs_version: 0.10.40
platform: x86 platform: x86
......
{ {
"name": "sqlite3", "name": "sqlite3",
"description": "Asynchronous, non-blocking SQLite3 bindings", "description": "Asynchronous, non-blocking SQLite3 bindings",
"version": "3.1.8", "version": "3.1.9",
"homepage": "http://github.com/mapbox/node-sqlite3", "homepage": "http://github.com/mapbox/node-sqlite3",
"author": { "author": {
"name": "MapBox", "name": "MapBox",
...@@ -37,13 +37,14 @@ ...@@ -37,13 +37,14 @@
"url": "git://github.com/mapbox/node-sqlite3.git" "url": "git://github.com/mapbox/node-sqlite3.git"
}, },
"dependencies": { "dependencies": {
"nan": "~2.4.0", "nan": "~2.6.2",
"node-pre-gyp": "~0.6.32" "node-pre-gyp": "~0.6.36"
}, },
"bundledDependencies": [ "bundledDependencies": [
"node-pre-gyp" "node-pre-gyp"
], ],
"devDependencies": { "devDependencies": {
"node-gyp": "^3.6.1",
"aws-sdk": "2.x", "aws-sdk": "2.x",
"eslint": "3.5.0", "eslint": "3.5.0",
"mocha": "3.x" "mocha": "3.x"
......
...@@ -48,13 +48,6 @@ IF %NODE_MAJOR% GTR 0 ECHO node version greater than zero, not updating npm && G ...@@ -48,13 +48,6 @@ IF %NODE_MAJOR% GTR 0 ECHO node version greater than zero, not updating npm && G
powershell Set-ExecutionPolicy Unrestricted -Scope CurrentUser -Force powershell Set-ExecutionPolicy Unrestricted -Scope CurrentUser -Force
IF %ERRORLEVEL% NEQ 0 GOTO ERROR IF %ERRORLEVEL% NEQ 0 GOTO ERROR
CALL npm install --global --production npm-windows-upgrade
IF %ERRORLEVEL% NEQ 0 GOTO ERROR
REM https://ci.appveyor.com/project/Mapbox/node-sqlite3/build/1.0.500/job/n2y9fo4eg316db56#L289
REM error C2373: '__pfnDliNotifyHook2': redefinition; different type modifiers
REM at least 2.15.9 is needed: https://github.com/nodejs/node-gyp/issues/972#issuecomment-231055109
CALL npm-windows-upgrade --npm-version 2.15.9 --no-dns-check --no-prompt
IF %ERRORLEVEL% NEQ 0 GOTO ERROR
:SKIP_APPVEYOR_INSTALL :SKIP_APPVEYOR_INSTALL
IF /I "%msvs_toolset%"=="12" GOTO NODE_INSTALLED IF /I "%msvs_toolset%"=="12" GOTO NODE_INSTALLED
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment