Skip to content

Commit cbadd8e

Browse files
committed
Merge branch 'master' of github.com:JoshuaWise/better-sqlite3
2 parents 0a3f1cf + f9af67d commit cbadd8e

File tree

2 files changed

+26
-4
lines changed

2 files changed

+26
-4
lines changed

.travis.yml

+24-2
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,19 @@ matrix:
2828
packages:
2929
- gcc-4.9
3030
- g++-4.9
31+
- name: "Linux - Node 14"
32+
os: linux
33+
node_js: "14"
34+
env:
35+
- CXX=g++-4.9
36+
- CC=gcc-4.9
37+
addons:
38+
apt:
39+
sources:
40+
- ubuntu-toolchain-r-test
41+
packages:
42+
- gcc-4.9
43+
- g++-4.9
3144
- name: "OS X - Node 10"
3245
os: osx
3346
node_js: "10"
@@ -44,11 +57,20 @@ matrix:
4457
env:
4558
- CXX=g++
4659
- CC=gcc
60+
61+
- name: "OS X - Node 14"
62+
os: osx
63+
node_js: "14"
64+
osx_image: xcode11
65+
compiler: clang
66+
env:
67+
- CXX=g++
68+
- CC=gcc
4769
before_script:
4870
- npm run build-debug
4971
before_deploy:
5072
- npm run build-release
51-
- $(npm bin)/prebuild -r node -t 10.20.0 -t 12.0.0 --include-regex 'better_sqlite3.node$'
73+
- $(npm bin)/prebuild -r node -t 10.20.0 -t 12.0.0 -t 14.0.0 --include-regex 'better_sqlite3.node$'
5274
- $(npm bin)/prebuild -r electron -t 4.0.0 -t 5.0.0 -t 6.0.0 -t 7.0.0 -t 8.0.0 --include-regex 'better_sqlite3.node$'
5375
deploy:
5476
provider: releases
@@ -60,4 +82,4 @@ deploy:
6082
on:
6183
repo: JoshuaWise/better-sqlite3
6284
tags: true
63-
node_js: "12"
85+
node_js: "14"

binding.gyp

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
'target_name': 'better_sqlite3',
1010
'dependencies': ['deps/sqlite3.gyp:sqlite3'],
1111
'sources': ['src/better_sqlite3.cpp'],
12-
'cflags': ['-std=c++11'],
12+
'cflags': ['-std=c++14'],
1313
'xcode_settings': {
14-
'OTHER_CPLUSPLUSFLAGS': ['-std=c++11', '-stdlib=libc++'],
14+
'OTHER_CPLUSPLUSFLAGS': ['-std=c++14', '-stdlib=libc++'],
1515
},
1616
},
1717
{

0 commit comments

Comments
 (0)