Merge branch 'master' into napi

6b5e3fee · Kewde · GitHub · af31fb87 · 75fee8af · 6b5e3fee
Unverified Commit 6b5e3fee authored Apr 19, 2020 by Kewde Committed by GitHub Apr 19, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 50 additions and 8 deletions

.travis.yml .travis.yml +29 -7

README.md README.md +1 -1

appveyor.yml appveyor.yml +20 -0

No files found.
--- a/.travis.yml
+++ b/.travis.yml
@@ -99,11 +99,27 @@ matrix:
       env: NODE_VERSION="6" # node abi 48
     # electron Linux
     - os: linux
-       compiler: clang
-       env: NODE_VERSION="8" ELECTRON_VERSION="8.0.0"
-       dist: trusty
-       addons:
-         apt:
+      compiler: clang
+      env: NODE_VERSION="8" 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="8" 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="8" 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
@@ -180,8 +196,14 @@ matrix:
            packages: [ 'clang-3.5', 'libstdc++-4.9-dev']
     # electron MacOs
     - os: osx
-       compiler: clang
-       env: NODE_VERSION="8" ELECTRON_VERSION="8.0.0"
+        compiler: clang
+        env: NODE_VERSION="8" ELECTRON_VERSION="8.2.0"
+     - os: osx
+        compiler: clang
+        env: NODE_VERSION="8" ELECTRON_VERSION="8.1.0"
+     - os: osx
+        compiler: clang
+        env: NODE_VERSION="8" ELECTRON_VERSION="8.0.0"
     - os: osx
       compiler: clang
       env: NODE_VERSION="8" ELECTRON_VERSION="7.1.0"

--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@ db.close();
 - Full Buffer/Blob support
 - Extensive [debugging support](https://github.com/mapbox/node-sqlite3/wiki/Debugging)
 - [Query serialization](https://github.com/mapbox/node-sqlite3/wiki/Control-Flow) API
- - [Extension support](https://github.com/mapbox/node-sqlite3/wiki/Extensions)
+ - [Extension support](https://github.com/mapbox/node-sqlite3/wiki/Extensions), including bundled support for the [json1 extension](https://www.sqlite.org/json1.html).
 - Big test suite
 - Written in modern C++ and tested for memory leaks
 - Bundles Sqlite3 3.26.0 as a fallback if the installing system doesn't include SQLite

--- a/appveyor.yml
+++ b/appveyor.yml
@@ -32,6 +32,26 @@ environment:
    - nodejs_version: 12
      platform: x64
      NODE_RUNTIME: electron
+      NODE_RUNTIME_VERSION: 8.2.0
+      TOOLSET_ARGS: --dist-url=https://electronjs.org/headers
+    - nodejs_version: 12
+      platform: x86
+      NODE_RUNTIME: electron
+      NODE_RUNTIME_VERSION: 8.2.0
+      TOOLSET_ARGS: --dist-url=https://electronjs.org/headers
+    - nodejs_version: 12
+      platform: x64
+      NODE_RUNTIME: electron
+      NODE_RUNTIME_VERSION: 8.1.0
+      TOOLSET_ARGS: --dist-url=https://electronjs.org/headers
+    - nodejs_version: 12
+      platform: x86
+      NODE_RUNTIME: electron
+      NODE_RUNTIME_VERSION: 8.1.0
+      TOOLSET_ARGS: --dist-url=https://electronjs.org/headers
+    - nodejs_version: 12
+      platform: x64
+      NODE_RUNTIME: electron
      NODE_RUNTIME_VERSION: 8.0.0
      TOOLSET_ARGS: --dist-url=https://electronjs.org/headers
    - nodejs_version: 12