From a706e1ddd67009ae5c49c94fdf1a7f91323ebaf9 Mon Sep 17 00:00:00 2001 From: Kewde Date: Mon, 28 Oct 2019 10:54:13 +0000 Subject: [PATCH 1/7] prebuilt: add electron 6.1 & 7 --- .travis.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/.travis.yml b/.travis.yml index e9cb61360..3d74e8f44 100644 --- a/.travis.yml +++ b/.travis.yml @@ -119,6 +119,22 @@ matrix: compiler: clang env: NODE_VERSION="4" # node abi 46 # electron Linux + - os: linux + compiler: clang + env: NODE_VERSION="6" 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="6" 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="6" ELECTRON_VERSION="6.0.0" @@ -204,6 +220,12 @@ matrix: sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ] packages: [ 'clang-3.5'] # electron MacOs + - os: osx + compiler: clang + env: NODE_VERSION="6" ELECTRON_VERSION="7.0.0" + - os: osx + compiler: clang + env: NODE_VERSION="6" ELECTRON_VERSION="6.1.0" - os: osx compiler: clang env: NODE_VERSION="6" ELECTRON_VERSION="6.0.0" From bd2a2c59bc5ba74381f578366d3a7049b3e4b903 Mon Sep 17 00:00:00 2001 From: Kewde Date: Mon, 28 Oct 2019 10:58:58 +0000 Subject: [PATCH 2/7] prebuilt: add electron 6.1 & 7 (Windows) --- appveyor.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index 6fde52ceb..69b7adf10 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -39,6 +39,26 @@ environment: - nodejs_version: 12 platform: x86 # electron + - nodejs_version: 12 + platform: x64 + NODE_RUNTIME: electron + NODE_RUNTIME_VERSION: 7.0.0 + TOOLSET_ARGS: --dist-url=https://atom.io/download/electron + - nodejs_version: 12 + platform: x86 + NODE_RUNTIME: electron + NODE_RUNTIME_VERSION: 7.0.0 + TOOLSET_ARGS: --dist-url=https://atom.io/download/electron + - nodejs_version: 12 + platform: x64 + NODE_RUNTIME: electron + NODE_RUNTIME_VERSION: 6.1.0 + TOOLSET_ARGS: --dist-url=https://atom.io/download/electron + - nodejs_version: 12 + platform: x86 + NODE_RUNTIME: electron + NODE_RUNTIME_VERSION: 6.1.0 + TOOLSET_ARGS: --dist-url=https://atom.io/download/electron - nodejs_version: 12 platform: x64 NODE_RUNTIME: electron From 4fbe67dfb8a639dc412219561ed36b2c8484e6dd Mon Sep 17 00:00:00 2001 From: Kewde Date: Mon, 28 Oct 2019 11:02:57 +0000 Subject: [PATCH 3/7] update version to 4.1.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 530f3c709..674fa8d29 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "sqlite3", "description": "Asynchronous, non-blocking SQLite3 bindings", - "version": "4.1.0", + "version": "4.1.1", "homepage": "https://github.com/mapbox/node-sqlite3", "author": { "name": "MapBox", From 77fd188fd5257db7239a4bbcb595396c20ce2e9d Mon Sep 17 00:00:00 2001 From: Kewde Date: Mon, 28 Oct 2019 11:09:41 +0000 Subject: [PATCH 4/7] Update CHANGELOG (also included missing versions 4.0.8 & 4.0.9) --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2bb205245..dad868bbc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog +## 4.1.0 +- Electron v6.1 and v7 support [#1237](https://github.com/mapbox/node-sqlite3/pull/1237) + ## 4.1.0 - Electron v6 support [#1195](https://github.com/mapbox/node-sqlite3/pull/1195) @@ -7,6 +10,12 @@ - Custom file header with `--sqlite_magic` [#1144](https://github.com/mapbox/node-sqlite3/pull/1144) - https everywhere [#1177](https://github.com/mapbox/node-sqlite3/pull/1177) +## 4.0.9 +- Use trusty as the base for prebuilts [#1167](https://github.com/mapbox/node-sqlite3/pull/1167) + +## 4.0.8 +- Rerelease of 4.0.7 but removed excess .vscode files [0df90c7](https://github.com/mapbox/node-sqlite3/commit/0df90c7811331169ad5f8fbad396422e72757af3) + ## 4.0.7 - Node v12 support From 801037ef5b3330baacbae45fd417a67b7fe6a4fa Mon Sep 17 00:00:00 2001 From: Kewde Date: Mon, 28 Oct 2019 11:20:49 +0000 Subject: [PATCH 5/7] Update changelog (sqlite3 autoconf update) --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dad868bbc..3f9fad81d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,8 @@ # Changelog -## 4.1.0 +## 4.1.1 - Electron v6.1 and v7 support [#1237](https://github.com/mapbox/node-sqlite3/pull/1237) +- SQLite3 update to 3.30.1 [#1238](https://github.com/mapbox/node-sqlite3/pull/1238) ## 4.1.0 From aeb43cc2bdb042d9f322e9ca590f44959528b1fe Mon Sep 17 00:00:00 2001 From: Kewde Date: Thu, 14 Nov 2019 08:22:25 +0000 Subject: [PATCH 6/7] Move changlogs to different PR --- CHANGELOG.md | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f9fad81d..2bb205245 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,5 @@ # Changelog -## 4.1.1 -- Electron v6.1 and v7 support [#1237](https://github.com/mapbox/node-sqlite3/pull/1237) -- SQLite3 update to 3.30.1 [#1238](https://github.com/mapbox/node-sqlite3/pull/1238) - ## 4.1.0 - Electron v6 support [#1195](https://github.com/mapbox/node-sqlite3/pull/1195) @@ -11,12 +7,6 @@ - Custom file header with `--sqlite_magic` [#1144](https://github.com/mapbox/node-sqlite3/pull/1144) - https everywhere [#1177](https://github.com/mapbox/node-sqlite3/pull/1177) -## 4.0.9 -- Use trusty as the base for prebuilts [#1167](https://github.com/mapbox/node-sqlite3/pull/1167) - -## 4.0.8 -- Rerelease of 4.0.7 but removed excess .vscode files [0df90c7](https://github.com/mapbox/node-sqlite3/commit/0df90c7811331169ad5f8fbad396422e72757af3) - ## 4.0.7 - Node v12 support From 022638c458a4bdbf140785851e10276aff53ab2e Mon Sep 17 00:00:00 2001 From: Kewde Date: Thu, 14 Nov 2019 08:23:06 +0000 Subject: [PATCH 7/7] Move version update to different pr --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 674fa8d29..530f3c709 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "sqlite3", "description": "Asynchronous, non-blocking SQLite3 bindings", - "version": "4.1.1", + "version": "4.1.0", "homepage": "https://github.com/mapbox/node-sqlite3", "author": { "name": "MapBox",