From dd730a1e9f5dbcb948008ca0752c67358bcb50d2 Mon Sep 17 00:00:00 2001 From: Anton Romanov Date: Wed, 28 Feb 2018 02:22:25 +0500 Subject: [PATCH 1/9] upload to github --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index c583d3694..4fd1ec029 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "sqlite3", "description": "Asynchronous, non-blocking SQLite3 bindings", "version": "3.1.13", - "homepage": "http://github.com/mapbox/node-sqlite3", + "homepage": "http://github.com/theone74/node-sqlite3", "author": { "name": "MapBox", "url": "https://mapbox.com/" @@ -10,8 +10,8 @@ "binary": { "module_name": "node_sqlite3", "module_path": "./lib/binding/{node_abi}-{platform}-{arch}", - "host": "https://mapbox-node-binary.s3.amazonaws.com", - "remote_path": "./{name}/v{version}/{toolset}/", + "host": "https://github.com/theone74/node-sqlite3/releases/download/", + "remote_path": "v{version}", "package_name": "{node_abi}-{platform}-{arch}.tar.gz" }, "contributors": [ @@ -34,7 +34,7 @@ ], "repository": { "type": "git", - "url": "git://github.com/mapbox/node-sqlite3.git" + "url": "git://github.com/theone74/node-sqlite3.git" }, "dependencies": { "nan": "~2.8.0", From 38b61047ad43f3672741fd4c24818ce8d02688f5 Mon Sep 17 00:00:00 2001 From: Anton Romanov Date: Wed, 28 Feb 2018 02:43:07 +0500 Subject: [PATCH 2/9] fix binary package_name --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4fd1ec029..97a73e9f0 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "module_path": "./lib/binding/{node_abi}-{platform}-{arch}", "host": "https://github.com/theone74/node-sqlite3/releases/download/", "remote_path": "v{version}", - "package_name": "{node_abi}-{platform}-{arch}.tar.gz" + "package_name": "{name}-v{version}-{node_abi}-{platform}-{arch}.tar.gz" }, "contributors": [ "Konstantin Käfer ", From 30c24ce32e49edb6022a3a9c373edde436f8b123 Mon Sep 17 00:00:00 2001 From: Sebastian Schmidt Date: Wed, 14 Mar 2018 08:05:50 +0100 Subject: [PATCH 3/9] Upgrade node-pre-gyp to version 0.9.0 --- .travis.yml | 12 +----------- CHANGELOG.md | 5 +++++ README.md | 2 +- appveyor.yml | 25 ------------------------- package.json | 2 +- 5 files changed, 8 insertions(+), 38 deletions(-) diff --git a/.travis.yml b/.travis.yml index 59b74d49e..c5756846e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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' ] @@ -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: diff --git a/CHANGELOG.md b/CHANGELOG.md index f34606b2b..ba27bdc59 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## [Unreleased] + + - Drop support for Node v0.10 and v.12 + - Upgrade to node-pre-gyp@0.9.0 + ## 3.1.13 - Attempt to fix regression of #866 diff --git a/README.md b/README.md index 6bdf33bf7..04a1faf07 100644 --- a/README.md +++ b/README.md @@ -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). diff --git a/appveyor.yml b/appveyor.yml index ce5c5808e..e49292670 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -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 @@ -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 diff --git a/package.json b/package.json index 97a73e9f0..056efde58 100644 --- a/package.json +++ b/package.json @@ -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" From 8caed6906d25daf45fb7bf32cf3ebc5c3efdedc7 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Wed, 14 Mar 2018 14:24:31 -0700 Subject: [PATCH 4/9] bump to v4.x (drops node v0.x support) [publish binary] --- CHANGELOG.md | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ba27bdc59..958f5bec6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## [Unreleased] +## 4.0.0 - Drop support for Node v0.10 and v.12 - Upgrade to node-pre-gyp@0.9.0 diff --git a/package.json b/package.json index 056efde58..e0d771a75 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "sqlite3", "description": "Asynchronous, non-blocking SQLite3 bindings", - "version": "3.1.13", + "version": "4.0.0", "homepage": "http://github.com/theone74/node-sqlite3", "author": { "name": "MapBox", From 2c7c60ea1fdfd1b988bf91c5096dce4b1794fc55 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Wed, 14 Mar 2018 15:31:24 -0700 Subject: [PATCH 5/9] upgrade nan to latest --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e0d771a75..6b96743bd 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "url": "git://github.com/theone74/node-sqlite3.git" }, "dependencies": { - "nan": "~2.8.0", + "nan": "~2.9.2", "node-pre-gyp": "~0.9.0" }, "bundledDependencies": [ From ee1f19d45fdb448711ff94b97f9bd06f7e9c5a41 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Thu, 15 Mar 2018 07:58:29 -0700 Subject: [PATCH 6/9] update changelog with nan update [skip ci] --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 958f5bec6..cb9328c8c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - Drop support for Node v0.10 and v.12 - Upgrade to node-pre-gyp@0.9.0 + - Upgrade to nan@2.9.2 ## 3.1.13 From d12b43ae3b15b4496f8fd12f93e967a8be0bc520 Mon Sep 17 00:00:00 2001 From: mapsam Date: Wed, 16 May 2018 17:15:56 -0700 Subject: [PATCH 7/9] add cfn template, remove encrypted vars --- .travis.yml | 2 -- appveyor.yml | 4 --- cloudformation/ci.template.js | 59 +++++++++++++++++++++++++++++++++++ package.json | 1 + 4 files changed, 60 insertions(+), 6 deletions(-) create mode 100644 cloudformation/ci.template.js diff --git a/.travis.yml b/.travis.yml index c5756846e..6509738e9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -94,8 +94,6 @@ matrix: env: global: - JOBS: "8" - - secure: PifMOSnn+mWR1RUptXse+fLvWiTrzg0R/mazO7RWhXHWBKv0uAJ/qV3dI0GIRBLtjG10Iy+tT5RNh1TIbBzB9Y67wMcGvylUPG1+3EOKoBMEPnOD9AgCEQw4SOXfGPx0cq2N6ueSKieCgu1yKN9Wq7XCbE+zTk/DiRNIdLirVoo= - - secure: cc4esJY1vPXL31IeumAJoKWDDO2BTGFiltwfO1jbTbiV7QT911QUjTUasxXIVpOaHNCpxSTyevPwwTWfzt2EtF92Lli+qhQ2bbzMiDSBZstSrHdAe62Ai2M1oYYUwk/0cABB/2nO9uRyYwITCxpTSNzZBrYhn3C29WqBhPeVDmM= before_install: - export PUBLISHABLE=${PUBLISHABLE:-true} diff --git a/appveyor.yml b/appveyor.yml index e49292670..4ed6b2a62 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,8 +1,4 @@ environment: - node_pre_gyp_accessKeyId: - secure: 7DrSVc5eIGtmMcki5H+iRft+Tk3MJTwDBQEUuJHWaQ4= - node_pre_gyp_secretAccessKey: - secure: 1amwJJw9fu0j6dXnc5KsAQbSYf7Cjw/dapT6OZWABa6nc52grkKeLQ+DGaOfQz8i matrix: - nodejs_version: 4 platform: x64 diff --git a/cloudformation/ci.template.js b/cloudformation/ci.template.js new file mode 100644 index 000000000..719e80071 --- /dev/null +++ b/cloudformation/ci.template.js @@ -0,0 +1,59 @@ +var cf = require('@mapbox/cloudfriend'); +var package_json = require('../package.json') + +module.exports = { + AWSTemplateFormatVersion: '2010-09-09', + Description: 'user for publishing to s3://mapbox-node-binary/' + package_json.name, + Resources: { + User: { + Type: 'AWS::IAM::User', + Properties: { + Policies: [ + { + PolicyName: 'list', + PolicyDocument: { + Statement: [ + { + Action: ['s3:ListBucket'], + Effect: 'Allow', + Resource: 'arn:aws:s3:::mapbox-node-binary', + Condition : { + StringLike : { + "s3:prefix": [ package_json.name + "/*"] + } + } + } + ] + } + }, + { + PolicyName: 'publish', + PolicyDocument: { + Statement: [ + { + Action: ['s3:DeleteObject', 's3:GetObject', 's3:GetObjectAcl', 's3:PutObject', 's3:PutObjectAcl'], + Effect: 'Allow', + Resource: 'arn:aws:s3:::mapbox-node-binary/' + package_json.name + '/*' + } + ] + } + } + ] + } + }, + AccessKey: { + Type: 'AWS::IAM::AccessKey', + Properties: { + UserName: cf.ref('User') + } + } + }, + Outputs: { + AccessKeyId: { + Value: cf.ref('AccessKey') + }, + SecretAccessKey: { + Value: cf.getAtt('AccessKey', 'SecretAccessKey') + } + } +}; diff --git a/package.json b/package.json index 6b96743bd..36dc611ed 100644 --- a/package.json +++ b/package.json @@ -44,6 +44,7 @@ "node-pre-gyp" ], "devDependencies": { + "@mapbox/cloudfriend": "^1.9.0", "aws-sdk": "2.x", "eslint": "3.5.0", "mocha": "3.x" From 13c75b00cfd4d075b0af9b011ebc399a39303096 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Fri, 27 Apr 2018 16:48:17 -0700 Subject: [PATCH 8/9] we need to call npm test otherwise the 'big.db' will not be created --- Makefile | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 56fcb276a..1cd9b770a 100644 --- a/Makefile +++ b/Makefile @@ -33,13 +33,8 @@ rebuild: @make clean @make -ifndef only test: - @PATH="./node_modules/mocha/bin:${PATH}" && NODE_PATH="./lib:$(NODE_PATH)" mocha -R spec -else -test: - @PATH="./node_modules/mocha/bin:${PATH}" && NODE_PATH="./lib:$(NODE_PATH)" mocha -R spec test/${only}.test.js -endif + npm test check: test From 8de44e113efd7155450adea852e07c6f4738b5c2 Mon Sep 17 00:00:00 2001 From: Anton Romanov Date: Fri, 1 Jun 2018 15:41:21 +0500 Subject: [PATCH 9/9] add prebuilds folder to .gitignore --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index cfbc04f98..24435f09e 100644 --- a/.gitignore +++ b/.gitignore @@ -24,4 +24,5 @@ test/nw/app.nw local.env .mason .eslintrc.js -setup.sh \ No newline at end of file +setup.sh +prebuilds \ No newline at end of file