Skip to content

Commit

Permalink
Merge pull request #952 from SebastianSchmidt/master
Browse files Browse the repository at this point in the history
Upgrade node-pre-gyp to version 0.9.0
  • Loading branch information
springmeyer authored Mar 14, 2018
2 parents a469960 + f937dea commit c4659eb
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 38 deletions.
12 changes: 1 addition & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,17 +60,10 @@ matrix:
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="0.10"
addons:
apt:
sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ]
packages: [ 'clang-3.5']
# test building against external sqlite
- os: linux
compiler: clang
env: NODE_VERSION="0.10" EXTERNAL_SQLITE=true PUBLISHABLE=false
env: NODE_VERSION="8" EXTERNAL_SQLITE=true PUBLISHABLE=false
addons:
apt:
sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ]
Expand All @@ -97,9 +90,6 @@ matrix:
- os: osx
compiler: clang
env: NODE_VERSION="4" # node abi 46
- os: osx
compiler: clang
env: NODE_VERSION="0.10" # node abi 11

env:
global:
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Changelog

## [Unreleased]

- Drop support for Node v0.10 and v.12
- Upgrade to [email protected]

## 3.1.13

- Attempt to fix regression of #866
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Asynchronous, non-blocking [SQLite3](http://sqlite.org/) bindings for [Node.js](

## Supported platforms

The `sqlite3` module works with Node.js v0.10.x, v0.12.x, v4.x, v5.x, v6.x and v7.x.
The `sqlite3` module works with Node.js v4.x, v5.x, v6.x and v7.x.

Binaries for most Node versions and platforms are provided by default via [node-pre-gyp](https://github.com/mapbox/node-pre-gyp).

Expand Down
25 changes: 0 additions & 25 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,6 @@ environment:
node_pre_gyp_secretAccessKey:
secure: 1amwJJw9fu0j6dXnc5KsAQbSYf7Cjw/dapT6OZWABa6nc52grkKeLQ+DGaOfQz8i
matrix:
- nodejs_version: 0.10
platform: x86
- nodejs_version: 0.10
platform: x64
- nodejs_version: 0.12
platform: x86
- nodejs_version: 0.12
platform: x64
- nodejs_version: 4
platform: x64
- nodejs_version: 4
Expand All @@ -36,23 +28,6 @@ environment:
platform: x64
- nodejs_version: 9
platform: x86
# custom visual studio 2015 builds
- nodejs_version: 0.10.40
platform: x86
msvs_toolset: 14
TOOLSET_ARGS: --dist-url=https://s3.amazonaws.com/mapbox/node-cpp11 --toolset=v140
- nodejs_version: 0.10.40
platform: x64
msvs_toolset: 14
TOOLSET_ARGS: --dist-url=https://s3.amazonaws.com/mapbox/node-cpp11 --toolset=v140
- nodejs_version: 0.12.7
platform: x86
msvs_toolset: 14
TOOLSET_ARGS: --dist-url=https://s3.amazonaws.com/mapbox/node-cpp11 --toolset=v140
- nodejs_version: 0.12.7
platform: x64
msvs_toolset: 14
TOOLSET_ARGS: --dist-url=https://s3.amazonaws.com/mapbox/node-cpp11 --toolset=v140

os: Visual Studio 2015

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
},
"dependencies": {
"nan": "~2.8.0",
"node-pre-gyp": "~0.6.38"
"node-pre-gyp": "~0.9.0"
},
"bundledDependencies": [
"node-pre-gyp"
Expand Down

0 comments on commit c4659eb

Please sign in to comment.