Skip to content

Commit fdd603e

Browse files
gjrtimmergjrtimmer
committed
Merge branch 'master' into update/options
2 parents a909aeb + 29ac65f commit fdd603e

File tree

2 files changed

+141
-10
lines changed

2 files changed

+141
-10
lines changed

‎.travis.yml

Lines changed: 138 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,147 @@
11
language: go
2-
sudo: required
3-
dist: trusty
2+
3+
os:
4+
- linux
5+
- osx
6+
7+
addons:
8+
apt:
9+
update: true
10+
411
env:
5-
- GOTAGS=
6-
- GOTAGS=libsqlite3
7-
- GOTAGS=trace
8-
- GOTAGS=vtable
12+
matrix:
13+
- GOTAGS=
14+
- GOTAGS=libsqlite3
15+
- GOTAGS=trace
16+
- GOTAGS=vtable
17+
918
go:
1019
- 1.7.x
1120
- 1.8.x
1221
- 1.9.x
22+
- 1.10.x
1323
- master
24+
25+
matrix:
26+
allow_failures:
27+
- go: master
28+
exclude:
29+
- os: osx
30+
go: 1.7.x
31+
include:
32+
- os: linux
33+
go: 1.7.x
34+
env: GOTAGS= GOOS=windows GOARCH=386
35+
- os: linux
36+
go: 1.7.x
37+
env: GOTAGS= GOOS=windows GOARCH=amd64
38+
- os: linux
39+
go: 1.7.x
40+
env: GOTAGS=libsqlite3 GOOS=windows GOARCH=386
41+
- os: linux
42+
go: 1.7.x
43+
env: GOTAGS=libsqlite3 GOOS=windows GOARCH=amd64
44+
- os: linux
45+
go: 1.7.x
46+
env: GOTAGS=trace GOOS=windows GOARCH=386
47+
- os: linux
48+
go: 1.7.x
49+
env: GOTAGS=trace GOOS=windows GOARCH=amd64
50+
- os: linux
51+
go: 1.7.x
52+
env: GOTAGS=vtable GOOS=windows GOARCH=386
53+
- os: linux
54+
go: 1.7.x
55+
env: GOTAGS=vtable GOOS=windows GOARCH=amd64
56+
- os: linux
57+
go: 1.8.x
58+
env: GOTAGS= GOOS=windows GOARCH=386
59+
- os: linux
60+
go: 1.8.x
61+
env: GOTAGS= GOOS=windows GOARCH=amd64
62+
- os: linux
63+
go: 1.8.x
64+
env: GOTAGS=libsqlite3 GOOS=windows GOARCH=386
65+
- os: linux
66+
go: 1.8.x
67+
env: GOTAGS=libsqlite3 GOOS=windows GOARCH=amd64
68+
- os: linux
69+
go: 1.8.x
70+
env: GOTAGS=trace GOOS=windows GOARCH=386
71+
- os: linux
72+
go: 1.8.x
73+
env: GOTAGS=trace GOOS=windows GOARCH=amd64
74+
- os: linux
75+
go: 1.8.x
76+
env: GOTAGS=vtable GOOS=windows GOARCH=386
77+
- os: linux
78+
go: 1.8.x
79+
env: GOTAGS=vtable GOOS=windows GOARCH=amd64
80+
- os: linux
81+
go: 1.9.x
82+
env: GOTAGS= GOOS=windows GOARCH=386
83+
- os: linux
84+
go: 1.9.x
85+
env: GOTAGS= GOOS=windows GOARCH=amd64
86+
- os: linux
87+
go: 1.9.x
88+
env: GOTAGS=libsqlite3 GOOS=windows GOARCH=386
89+
- os: linux
90+
go: 1.9.x
91+
env: GOTAGS=libsqlite3 GOOS=windows GOARCH=amd64
92+
- os: linux
93+
go: 1.9.x
94+
env: GOTAGS=trace GOOS=windows GOARCH=386
95+
- os: linux
96+
go: 1.9.x
97+
env: GOTAGS=trace GOOS=windows GOARCH=amd64
98+
- os: linux
99+
go: 1.9.x
100+
env: GOTAGS=vtable GOOS=windows GOARCH=386
101+
- os: linux
102+
go: 1.9.x
103+
env: GOTAGS=vtable GOOS=windows GOARCH=amd64
104+
- os: linux
105+
go: 1.10.x
106+
env: GOTAGS= GOOS=windows GOARCH=386
107+
- os: linux
108+
go: 1.10.x
109+
env: GOTAGS= GOOS=windows GOARCH=amd64
110+
- os: linux
111+
go: 1.10.x
112+
env: GOTAGS=libsqlite3 GOOS=windows GOARCH=386
113+
- os: linux
114+
go: 1.10.x
115+
env: GOTAGS=libsqlite3 GOOS=windows GOARCH=amd64
116+
- os: linux
117+
go: 1.10.x
118+
env: GOTAGS=trace GOOS=windows GOARCH=386
119+
- os: linux
120+
go: 1.10.x
121+
env: GOTAGS=trace GOOS=windows GOARCH=amd64
122+
- os: linux
123+
go: 1.10.x
124+
env: GOTAGS=vtable GOOS=windows GOARCH=386
125+
- os: linux
126+
go: 1.10.x
127+
env: GOTAGS=vtable GOOS=windows GOARCH=amd64
128+
129+
14130
before_install:
15-
- go get github.com/mattn/goveralls
16-
- go get golang.org/x/tools/cmd/cover
131+
- |
132+
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
133+
brew update
134+
fi
135+
- |
136+
if [[ "${GOOS}" != "windows" ]]; then
137+
go get github.com/mattn/goveralls
138+
go get golang.org/x/tools/cmd/cover
139+
fi
140+
17141
script:
18-
- $HOME/gopath/bin/goveralls -repotoken 3qJVUE0iQwqnCbmNcDsjYu1nh4J4KIFXx
19-
- go test -race -v . -tags "$GOTAGS"
142+
- GOOS=$(go env GOOS) GOARCH=$(go env GOARCH) go build -v -tags "${GOTAGS}" .
143+
- |
144+
if [[ "${GOOS}" != "windows" ]]; then
145+
$HOME/gopath/bin/goveralls -repotoken 3qJVUE0iQwqnCbmNcDsjYu1nh4J4KIFXx
146+
go test -race -v . -tags "${GOTAGS}"
147+
fi

‎sqlite3.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@ package sqlite3
1313
#cgo linux,!android CFLAGS: -DHAVE_PREAD64=1 -DHAVE_PWRITE64=1
1414
#cgo CFLAGS: -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4_UNICODE61
1515
#cgo CFLAGS: -DSQLITE_TRACE_SIZE_LIMIT=15
16+
#cgo CFLAGS: -DSQLITE_OMIT_DEPRECATED
1617
#cgo CFLAGS: -DSQLITE_DISABLE_INTRINSIC
18+
#cgo CFLAGS: -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1
19+
#cgo CFLAGS: -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT
1720
#cgo CFLAGS: -Wno-deprecated-declarations
1821
#ifndef USE_LIBSQLITE3
1922
#include <sqlite3-binding.h>

0 commit comments

Comments
 (0)