diff --git a/.travis.yml b/.travis.yml index d07a1d556..a37acbddf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,22 +18,22 @@ addons: matrix: include: # Linux - - os: linux - dist: trusty - compiler: clang - env: NODE_VERSION="14" - addons: - apt: - sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ] - packages: [ 'clang-3.5', 'libstdc++-4.9-dev'] - - os: linux - dist: trusty - compiler: clang - env: NODE_VERSION="13" - addons: - apt: - sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ] - packages: [ 'clang-3.5', 'libstdc++-4.9-dev'] +# - os: linux +# dist: trusty +# compiler: clang +# env: NODE_VERSION="14" +# addons: +# apt: +# sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ] +# packages: [ 'clang-3.5', 'libstdc++-4.9-dev'] +# - os: linux +# dist: trusty +# compiler: clang +# env: NODE_VERSION="13" +# addons: +# apt: +# sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ] +# packages: [ 'clang-3.5', 'libstdc++-4.9-dev'] - os: linux dist: trusty compiler: clang @@ -42,126 +42,126 @@ matrix: apt: sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ] packages: [ 'clang-3.5', 'libstdc++-4.9-dev'] - - os: linux - compiler: clang - env: NODE_VERSION="11" - addons: - apt: - sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ] - packages: [ 'clang-3.5', 'libstdc++-4.9-dev'] - - os: linux - compiler: clang - env: NODE_VERSION="10" - addons: - apt: - sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ] - packages: [ 'clang-3.5', 'libstdc++-4.9-dev'] +# - os: linux +# compiler: clang +# env: NODE_VERSION="11" +# addons: +# apt: +# sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ] +# packages: [ 'clang-3.5', 'libstdc++-4.9-dev'] +# - os: linux +# compiler: clang +# env: NODE_VERSION="10" +# addons: +# apt: +# sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ] +# packages: [ 'clang-3.5', 'libstdc++-4.9-dev'] # OS X - - os: osx - compiler: clang - env: NODE_VERSION="14" # node abi 83 - - os: osx - compiler: clang - env: NODE_VERSION="13" # node abi 79 - - os: osx - compiler: clang - env: NODE_VERSION="12" # node abi 72 - - os: osx - compiler: clang - env: NODE_VERSION="11" # node abi 67 - - os: osx - compiler: clang - env: NODE_VERSION="10" # node abi 67 +# - os: osx +# compiler: clang +# env: NODE_VERSION="14" # node abi 83 +# - os: osx +# compiler: clang +# env: NODE_VERSION="13" # node abi 79 +# - os: osx +# compiler: clang +# env: NODE_VERSION="12" # node abi 72 +# - os: osx +# compiler: clang +# env: NODE_VERSION="11" # node abi 67 +# - os: osx +# compiler: clang +# env: NODE_VERSION="10" # node abi 67 # electron Linux - - os: linux - compiler: clang - env: NODE_VERSION="12.13.0" ELECTRON_VERSION="8.2.0" - dist: trusty - addons: - apt: - sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ] - packages: [ 'clang-3.5', 'libstdc++-4.9-dev'] - - os: linux - compiler: clang - env: NODE_VERSION="12.13.0" ELECTRON_VERSION="8.1.0" - dist: trusty - addons: - apt: - sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ] - packages: [ 'clang-3.5', 'libstdc++-4.9-dev'] - - os: linux - compiler: clang - env: NODE_VERSION="12.13.0" ELECTRON_VERSION="8.0.0" - dist: trusty - addons: - apt: - sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ] - packages: [ 'clang-3.5', 'libstdc++-4.9-dev'] - - os: linux - compiler: clang - env: NODE_VERSION="12.8.1" ELECTRON_VERSION="7.2.0" - dist: trusty - addons: - apt: - sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ] - packages: [ 'clang-3.5', 'libstdc++-4.9-dev'] - - os: linux - compiler: clang - env: NODE_VERSION="12.8.1" ELECTRON_VERSION="7.1.0" - dist: trusty - addons: - apt: - sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ] - packages: [ 'clang-3.5', 'libstdc++-4.9-dev'] - - os: linux - compiler: clang - env: NODE_VERSION="12.8.1" ELECTRON_VERSION="7.0.0" - dist: trusty - addons: - apt: - sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ] - packages: [ 'clang-3.5', 'libstdc++-4.9-dev'] - - os: linux - compiler: clang - env: NODE_VERSION="12.4.0" ELECTRON_VERSION="6.1.0" - dist: trusty - addons: - apt: - sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ] - packages: [ 'clang-3.5', 'libstdc++-4.9-dev'] - - os: linux - compiler: clang - env: NODE_VERSION="12.4.0" ELECTRON_VERSION="6.0.0" - dist: trusty # needed for libc6 / 'version `GLIBC_2.17` not found' error on precise - addons: - apt: - sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ] - packages: [ 'clang-3.5', 'libstdc++-4.9-dev'] +# - os: linux +# compiler: clang +# env: NODE_VERSION="12.13.0" ELECTRON_VERSION="8.2.0" +# dist: trusty +# addons: +# apt: +# sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ] +# packages: [ 'clang-3.5', 'libstdc++-4.9-dev'] +# - os: linux +# compiler: clang +# env: NODE_VERSION="12.13.0" ELECTRON_VERSION="8.1.0" +# dist: trusty +# addons: +# apt: +# sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ] +# packages: [ 'clang-3.5', 'libstdc++-4.9-dev'] +# - os: linux +# compiler: clang +# env: NODE_VERSION="12.13.0" ELECTRON_VERSION="8.0.0" +# dist: trusty +# addons: +# apt: +# sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ] +# packages: [ 'clang-3.5', 'libstdc++-4.9-dev'] +# - os: linux +# compiler: clang +# env: NODE_VERSION="12.8.1" ELECTRON_VERSION="7.2.0" +# dist: trusty +# addons: +# apt: +# sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ] +# packages: [ 'clang-3.5', 'libstdc++-4.9-dev'] +# - os: linux +# compiler: clang +# env: NODE_VERSION="12.8.1" ELECTRON_VERSION="7.1.0" +# dist: trusty +# addons: +# apt: +# sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ] +# packages: [ 'clang-3.5', 'libstdc++-4.9-dev'] +# - os: linux +# compiler: clang +# env: NODE_VERSION="12.8.1" ELECTRON_VERSION="7.0.0" +# dist: trusty +# addons: +# apt: +# sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ] +# packages: [ 'clang-3.5', 'libstdc++-4.9-dev'] +# - os: linux +# compiler: clang +# env: NODE_VERSION="12.4.0" ELECTRON_VERSION="6.1.0" +# dist: trusty +# addons: +# apt: +# sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ] +# packages: [ 'clang-3.5', 'libstdc++-4.9-dev'] +# - os: linux +# compiler: clang +# env: NODE_VERSION="12.4.0" ELECTRON_VERSION="6.0.0" +# dist: trusty # needed for libc6 / 'version `GLIBC_2.17` not found' error on precise +# addons: +# apt: +# sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ] +# packages: [ 'clang-3.5', 'libstdc++-4.9-dev'] # electron MacOs - - os: osx - compiler: clang - env: NODE_VERSION="12.13.0" ELECTRON_VERSION="8.2.0" - - os: osx - compiler: clang - env: NODE_VERSION="12.13.0" ELECTRON_VERSION="8.1.0" - - os: osx - compiler: clang - env: NODE_VERSION="12.13.0" ELECTRON_VERSION="8.0.0" - - os: osx - compiler: clang - env: NODE_VERSION="12.8.1" ELECTRON_VERSION="7.2.0" - - os: osx - compiler: clang - env: NODE_VERSION="12.8.1" ELECTRON_VERSION="7.1.0" - - os: osx - compiler: clang - env: NODE_VERSION="12.8.1" ELECTRON_VERSION="7.0.0" - - os: osx - compiler: clang - env: NODE_VERSION="12.4.0" ELECTRON_VERSION="6.1.0" - - os: osx - compiler: clang - env: NODE_VERSION="12.4.0" ELECTRON_VERSION="6.0.0" +# - os: osx +# compiler: clang +# env: NODE_VERSION="12.13.0" ELECTRON_VERSION="8.2.0" +# - os: osx +# compiler: clang +# env: NODE_VERSION="12.13.0" ELECTRON_VERSION="8.1.0" +# - os: osx +# compiler: clang +# env: NODE_VERSION="12.13.0" ELECTRON_VERSION="8.0.0" +# - os: osx +# compiler: clang +# env: NODE_VERSION="12.8.1" ELECTRON_VERSION="7.2.0" +# - os: osx +# compiler: clang +# env: NODE_VERSION="12.8.1" ELECTRON_VERSION="7.1.0" +# - os: osx +# compiler: clang +# env: NODE_VERSION="12.8.1" ELECTRON_VERSION="7.0.0" +# - os: osx +# compiler: clang +# env: NODE_VERSION="12.4.0" ELECTRON_VERSION="6.1.0" +# - os: osx +# compiler: clang +# env: NODE_VERSION="12.4.0" ELECTRON_VERSION="6.0.0" env: global: @@ -189,9 +189,9 @@ before_script: script: - if [[ "${NODE_VERSION}" ]]; then - if [[ "${ELECTRON_VERSION}" ]]; then - ./scripts/build_against_electron.sh; - else +# if [[ "${ELECTRON_VERSION}" ]]; then +# ./scripts/build_against_electron.sh; +# else ./scripts/build_against_node.sh; fi; fi diff --git a/appveyor.yml b/appveyor.yml index 80bdbbb09..d75e63d55 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,106 +1,106 @@ environment: matrix: - - nodejs_version: 10 - platform: x64 - - nodejs_version: 10 - platform: x86 - - nodejs_version: 11 - platform: x64 - - nodejs_version: 11 - platform: x86 +# - nodejs_version: 10 +# platform: x64 +# - nodejs_version: 10 +# platform: x86 +# - nodejs_version: 11 +# platform: x64 +# - nodejs_version: 11 +# platform: x86 - nodejs_version: 12 platform: x64 - nodejs_version: 12 platform: x86 - - nodejs_version: 13 - platform: x64 - - nodejs_version: 13 - platform: x86 - - nodejs_version: 14 - platform: x64 - - nodejs_version: 14 - platform: x86 +# - nodejs_version: 13 +# platform: x64 +# - nodejs_version: 13 +# platform: x86 +# - nodejs_version: 14 +# platform: x64 +# - nodejs_version: 14 +# platform: x86 # electron - - nodejs_version: 12.13.0 - platform: x64 - NODE_RUNTIME: electron - NODE_RUNTIME_VERSION: 8.2.0 - TOOLSET_ARGS: --dist-url=https://electronjs.org/headers - - nodejs_version: 12.13.0 - platform: x86 - NODE_RUNTIME: electron - NODE_RUNTIME_VERSION: 8.2.0 - TOOLSET_ARGS: --dist-url=https://electronjs.org/headers - - nodejs_version: 12.13.0 - platform: x64 - NODE_RUNTIME: electron - NODE_RUNTIME_VERSION: 8.1.0 - TOOLSET_ARGS: --dist-url=https://electronjs.org/headers - - nodejs_version: 12.13.0 - platform: x86 - NODE_RUNTIME: electron - NODE_RUNTIME_VERSION: 8.1.0 - TOOLSET_ARGS: --dist-url=https://electronjs.org/headers - - nodejs_version: 12.13.0 - platform: x64 - NODE_RUNTIME: electron - NODE_RUNTIME_VERSION: 8.0.0 - TOOLSET_ARGS: --dist-url=https://electronjs.org/headers - - nodejs_version: 12.13.0 - platform: x86 - NODE_RUNTIME: electron - NODE_RUNTIME_VERSION: 8.0.0 - TOOLSET_ARGS: --dist-url=https://electronjs.org/headers - - nodejs_version: 12.8.1 - platform: x64 - NODE_RUNTIME: electron - NODE_RUNTIME_VERSION: 7.2.0 - TOOLSET_ARGS: --dist-url=https://electronjs.org/headers - - nodejs_version: 12.8.1 - platform: x86 - NODE_RUNTIME: electron - NODE_RUNTIME_VERSION: 7.2.0 - TOOLSET_ARGS: --dist-url=https://electronjs.org/headers - - nodejs_version: 12.8.1 - platform: x64 - NODE_RUNTIME: electron - NODE_RUNTIME_VERSION: 7.1.0 - TOOLSET_ARGS: --dist-url=https://electronjs.org/headers - - nodejs_version: 12.8.1 - platform: x86 - NODE_RUNTIME: electron - NODE_RUNTIME_VERSION: 7.1.0 - TOOLSET_ARGS: --dist-url=https://electronjs.org/headers - - nodejs_version: 12.8.1 - platform: x64 - NODE_RUNTIME: electron - NODE_RUNTIME_VERSION: 7.0.0 - TOOLSET_ARGS: --dist-url=https://electronjs.org/headers - - nodejs_version: 12.8.1 - platform: x86 - NODE_RUNTIME: electron - NODE_RUNTIME_VERSION: 7.0.0 - TOOLSET_ARGS: --dist-url=https://electronjs.org/headers - - nodejs_version: 12.4.0 - platform: x64 - NODE_RUNTIME: electron - NODE_RUNTIME_VERSION: 6.1.0 - TOOLSET_ARGS: --dist-url=https://electronjs.org/headers - - nodejs_version: 12.4.0 - platform: x86 - NODE_RUNTIME: electron - NODE_RUNTIME_VERSION: 6.1.0 - TOOLSET_ARGS: --dist-url=https://electronjs.org/headers - - nodejs_version: 12.4.0 - platform: x64 - NODE_RUNTIME: electron - NODE_RUNTIME_VERSION: 6.0.0 - TOOLSET_ARGS: --dist-url=https://electronjs.org/headers - - nodejs_version: 12.4.0 - platform: x86 - NODE_RUNTIME: electron - NODE_RUNTIME_VERSION: 6.0.0 - TOOLSET_ARGS: --dist-url=https://electronjs.org/headers +# - nodejs_version: 12.13.0 +# platform: x64 +# NODE_RUNTIME: electron +# NODE_RUNTIME_VERSION: 8.2.0 +# TOOLSET_ARGS: --dist-url=https://electronjs.org/headers +# - nodejs_version: 12.13.0 +# platform: x86 +# NODE_RUNTIME: electron +# NODE_RUNTIME_VERSION: 8.2.0 +# TOOLSET_ARGS: --dist-url=https://electronjs.org/headers +# - nodejs_version: 12.13.0 +# platform: x64 +# NODE_RUNTIME: electron +# NODE_RUNTIME_VERSION: 8.1.0 +# TOOLSET_ARGS: --dist-url=https://electronjs.org/headers +# - nodejs_version: 12.13.0 +# platform: x86 +# NODE_RUNTIME: electron +# NODE_RUNTIME_VERSION: 8.1.0 +# TOOLSET_ARGS: --dist-url=https://electronjs.org/headers +# - nodejs_version: 12.13.0 +# platform: x64 +# NODE_RUNTIME: electron +# NODE_RUNTIME_VERSION: 8.0.0 +# TOOLSET_ARGS: --dist-url=https://electronjs.org/headers +# - nodejs_version: 12.13.0 +# platform: x86 +# NODE_RUNTIME: electron +# NODE_RUNTIME_VERSION: 8.0.0 +# TOOLSET_ARGS: --dist-url=https://electronjs.org/headers +# - nodejs_version: 12.8.1 +# platform: x64 +# NODE_RUNTIME: electron +# NODE_RUNTIME_VERSION: 7.2.0 +# TOOLSET_ARGS: --dist-url=https://electronjs.org/headers +# - nodejs_version: 12.8.1 +# platform: x86 +# NODE_RUNTIME: electron +# NODE_RUNTIME_VERSION: 7.2.0 +# TOOLSET_ARGS: --dist-url=https://electronjs.org/headers +# - nodejs_version: 12.8.1 +# platform: x64 +# NODE_RUNTIME: electron +# NODE_RUNTIME_VERSION: 7.1.0 +# TOOLSET_ARGS: --dist-url=https://electronjs.org/headers +# - nodejs_version: 12.8.1 +# platform: x86 +# NODE_RUNTIME: electron +# NODE_RUNTIME_VERSION: 7.1.0 +# TOOLSET_ARGS: --dist-url=https://electronjs.org/headers +# - nodejs_version: 12.8.1 +# platform: x64 +# NODE_RUNTIME: electron +# NODE_RUNTIME_VERSION: 7.0.0 +# TOOLSET_ARGS: --dist-url=https://electronjs.org/headers +# - nodejs_version: 12.8.1 +# platform: x86 +# NODE_RUNTIME: electron +# NODE_RUNTIME_VERSION: 7.0.0 +# TOOLSET_ARGS: --dist-url=https://electronjs.org/headers +# - nodejs_version: 12.4.0 +# platform: x64 +# NODE_RUNTIME: electron +# NODE_RUNTIME_VERSION: 6.1.0 +# TOOLSET_ARGS: --dist-url=https://electronjs.org/headers +# - nodejs_version: 12.4.0 +# platform: x86 +# NODE_RUNTIME: electron +# NODE_RUNTIME_VERSION: 6.1.0 +# TOOLSET_ARGS: --dist-url=https://electronjs.org/headers +# - nodejs_version: 12.4.0 +# platform: x64 +# NODE_RUNTIME: electron +# NODE_RUNTIME_VERSION: 6.0.0 +# TOOLSET_ARGS: --dist-url=https://electronjs.org/headers +# - nodejs_version: 12.4.0 +# platform: x86 +# NODE_RUNTIME: electron +# NODE_RUNTIME_VERSION: 6.0.0 +# TOOLSET_ARGS: --dist-url=https://electronjs.org/headers image: Visual Studio 2017 diff --git a/commands.txt b/commands.txt new file mode 100644 index 000000000..d6c9ef6cd --- /dev/null +++ b/commands.txt @@ -0,0 +1,15 @@ +https://neon-bindings.com/docs/publishing/ + +Draft release + +node-pre-gyp configure +node-pre-gyp build +node-pre-gyp package +node-pre-gyp-github publish // creates/updates release + +Prod release + +node-pre-gyp configure +node-pre-gyp build +node-pre-gyp package +node-pre-gyp-github publish --release // creates/updates release diff --git a/package.json b/package.json index d3f2ddd70..91087ceb3 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "sqlite3", "description": "Asynchronous, non-blocking SQLite3 bindings", - "version": "5.0.2", + "version": "5.0.2-BINT", "homepage": "https://github.com/mapbox/node-sqlite3", "author": { "name": "MapBox", @@ -10,8 +10,8 @@ "binary": { "module_name": "node_sqlite3", "module_path": "./lib/binding/napi-v{napi_build_version}-{platform}-{arch}", - "host": "https://mapbox-node-binary.s3.amazonaws.com", - "remote_path": "./{name}/v{version}/{toolset}/", + "host": "https://github.com/sacOO7/node-sqlite3/releases/download/", + "remote_path": "{version}", "package_name": "napi-v{napi_build_version}-{platform}-{arch}.tar.gz", "napi_versions": [ 3 @@ -37,7 +37,7 @@ ], "repository": { "type": "git", - "url": "git://github.com/mapbox/node-sqlite3.git" + "url": "git+https://github.com/sacOO7/node-sqlite3.git" }, "dependencies": { "node-addon-api": "^3.0.0", @@ -47,7 +47,8 @@ "@mapbox/cloudfriend": "^1.9.0", "aws-sdk": "2.x", "eslint": "3.5.0", - "mocha": "^5.2.0" + "mocha": "^5.2.0", + "node-pre-gyp-github": "^1.4.3" }, "peerDependencies": { "node-gyp": "7.x" @@ -61,10 +62,14 @@ "node-gyp": "7.x" }, "scripts": { + "clean": "node-pre-gyp clean", + "build": "node-pre-gyp build", "install": "node-pre-gyp install --fallback-to-build", "pretest": "node test/support/createdb.js", "test": "mocha -R spec --timeout 480000", - "pack": "node-pre-gyp package" + "pack": "node-pre-gyp package", + "publish": "node-pre-gyp-github publish", + "upload-binary": "node-pre-gyp package && node-pre-gyp-github publish" }, "license": "BSD-3-Clause", "keywords": [ diff --git a/scripts/build-appveyor.bat b/scripts/build-appveyor.bat index c724c11cb..265c70c06 100644 --- a/scripts/build-appveyor.bat +++ b/scripts/build-appveyor.bat @@ -146,7 +146,7 @@ ECHO packaging for node-gyp CALL node_modules\.bin\node-pre-gyp package %TOOLSET_ARGS% ::make commit message env var shorter SET CM=%APPVEYOR_REPO_COMMIT_MESSAGE% -IF NOT "%CM%" == "%CM:[publish binary]=%" (ECHO publishing && CALL node_modules\.bin\node-pre-gyp --msvs_version=%msvs_version% publish %TOOLSET_ARGS%) ELSE (ECHO not publishing) +IF NOT "%CM%" == "%CM:[publish binary]=%" (ECHO publishing && CALL npm run upload-binary ELSE (ECHO not publishing) IF %ERRORLEVEL% NEQ 0 GOTO ERROR GOTO DONE diff --git a/scripts/build_against_electron.sh b/scripts/build_against_electron.sh index 7334b12e1..0e3bc1839 100755 --- a/scripts/build_against_electron.sh +++ b/scripts/build_against_electron.sh @@ -9,10 +9,11 @@ GYP_ARGS="--runtime=electron --target=${ELECTRON_VERSION} --dist-url=https://ele NPM_BIN_DIR="$(npm bin -g 2>/dev/null)" function publish() { - if [[ ${PUBLISHABLE:-false} == true ]] && [[ ${COMMIT_MESSAGE} =~ "[publish binary]" ]]; then + if [[ ${COMMIT_MESSAGE} =~ "[publish binary]" ]]; then node-pre-gyp rebuild --clang=1 $GYP_ARGS - node-pre-gyp package $GYP_ARGS - node-pre-gyp publish $GYP_ARGS + npm run upload-binary +# node-pre-gyp package $GYP_ARGS +# node-pre-gyp publish $GYP_ARGS node-pre-gyp info $GYP_ARGS fi } @@ -24,10 +25,10 @@ function electron_pretest() { else npm install -g electron-mocha fi - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then + if [ "${TRAVIS_OS_NAME}" = "osx" ]; then (sudo Xvfb :99 -ac -screen 0 1024x768x8; echo ok )& else - sh -e /etc/init.d/xvfb start + sh -e /etc/init.d/xvfb start fi sleep 3 diff --git a/scripts/build_against_node.sh b/scripts/build_against_node.sh index 6a217943d..d29a0e584 100755 --- a/scripts/build_against_node.sh +++ b/scripts/build_against_node.sh @@ -5,11 +5,12 @@ source ~/.nvm/nvm.sh set -e -u function publish() { - if [[ ${PUBLISHABLE:-false} == true ]] && [[ ${COMMIT_MESSAGE} =~ "[publish binary]" ]]; then + if [[ ${COMMIT_MESSAGE} =~ "[publish binary]" ]]; then CFLAGS="${CFLAGS:-} -include $(pwd)/src/gcc-preinclude.h" CXXFLAGS="${CXXFLAGS:-} -include $(pwd)/src/gcc-preinclude.h" node-pre-gyp rebuild --clang=1 node-pre-gyp package testpackage - node-pre-gyp publish - node-pre-gyp info + npm run upload-binary +# node-pre-gyp publish +# node-pre-gyp info make clean fi } diff --git a/scripts/build_against_node_webkit.sh b/scripts/build_against_node_webkit.sh index 584fc7d82..07a32857a 100755 --- a/scripts/build_against_node_webkit.sh +++ b/scripts/build_against_node_webkit.sh @@ -74,7 +74,8 @@ node-pre-gyp package testpackage ${GYP_ARGS} PUBLISH_BINARY=false if test "${COMMIT_MESSAGE#*'[publish binary]'}" != "$COMMIT_MESSAGE"; then - node-pre-gyp publish ${GYP_ARGS} + npm run upload-binary +# node-pre-gyp publish ${GYP_ARGS} node-pre-gyp info ${GYP_ARGS} node-pre-gyp clean ${GYP_ARGS} make clean diff --git a/scripts/build_for_node_webkit.cmd b/scripts/build_for_node_webkit.cmd index ef809be15..3a55922ea 100644 --- a/scripts/build_for_node_webkit.cmd +++ b/scripts/build_for_node_webkit.cmd @@ -11,5 +11,7 @@ dir nw set PATH=nw;%PATH% call node-pre-gyp rebuild --runtime=node-webkit --target=%nw_version% --target_arch=ia32 call node-pre-gyp package testpackage --runtime=node-webkit --target=%nw_version% --target_arch=ia32 -if not "%CM%" == "%CM:[publish binary]=%" call node-pre-gyp publish --msvs_version=2013 --runtime=node-webkit --target=%nw_version% --target_arch=ia32 -:end \ No newline at end of file +if not "%CM%" == "%CM:[publish binary]=%" +call node-pre-gyp package --msvs_version=2013 --runtime=node-webkit --target=%nw_version% --target_arch=ia32 +call npm run publish +:end diff --git a/src/statement.cc b/src/statement.cc index 9f6a9cd1e..ce2702fca 100644 --- a/src/statement.cc +++ b/src/statement.cc @@ -810,7 +810,8 @@ Napi::Value Statement::RowToJS(Napi::Env env, Row* row) { switch (field->type) { case SQLITE_INTEGER: { - value = Napi::Number::New(env, ((Values::Integer*)field)->value); + std::string s = std::to_string(((Values::Integer*)field)->value); + value = Napi::String::New(env, s.c_str(), s.size()); } break; case SQLITE_FLOAT: { value = Napi::Number::New(env, ((Values::Float*)field)->value);