Skip to content

Commit 22ede81

Browse files
committed
Add PostgreSQL 10 to CI
and change to Ubuntu 18.04 so building OpenSSL isn’t necessary, and move old PostgreSQL version tests to the latest Node LTS.
1 parent 755b392 commit 22ede81

File tree

4 files changed

+31
-109
lines changed

4 files changed

+31
-109
lines changed

Diff for: .travis.yml

+31-27
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,54 @@
11
language: node_js
2-
sudo: true
3-
dist: trusty
2+
dist: bionic
43

54
before_script:
65
- node script/create-test-tables.js pg://[email protected]:5432/postgres
7-
8-
before_install:
9-
- if [ $TRAVIS_OS_NAME == "linux" ]; then
10-
if [[ $(node -v) =~ v[1-9][0-9] ]]; then
11-
source ./ci_scripts/build.sh;
12-
fi
13-
fi
14-
6+
157
env:
168
- CC=clang CXX=clang++ npm_config_clang=1 PGUSER=postgres PGDATABASE=postgres
179

10+
node_js:
11+
- lts/dubnium
12+
- 12
13+
14+
addons:
15+
postgresql: "10"
16+
1817
matrix:
1918
include:
20-
- node_js: "lts/boron"
21-
addons:
22-
postgresql: "9.6"
23-
- node_js: "lts/argon"
19+
# different Node versions on PostgreSQL 9.5 that require precise
20+
- node_js: lts/argon
2421
addons:
25-
postgresql: "9.6"
26-
- node_js: "10"
27-
addons:
28-
postgresql: "9.6"
29-
- node_js: "12"
22+
postgresql: "9.5"
23+
dist: precise
24+
- node_js: lts/boron
3025
addons:
31-
postgresql: "9.6"
32-
- node_js: "lts/carbon"
26+
postgresql: "9.5"
27+
dist: precise
28+
- node_js: lts/carbon
3329
addons:
34-
postgresql: "9.1"
30+
postgresql: "9.5"
3531
dist: precise
36-
- node_js: "lts/carbon"
32+
33+
# different PostgreSQL versions on Node LTS
34+
- node_js: lts/dubnium
3735
addons:
3836
postgresql: "9.2"
39-
- node_js: "lts/carbon"
37+
- node_js: lts/dubnium
4038
addons:
4139
postgresql: "9.3"
42-
- node_js: "lts/carbon"
40+
- node_js: lts/dubnium
4341
addons:
4442
postgresql: "9.4"
45-
- node_js: "lts/carbon"
43+
- node_js: lts/dubnium
4644
addons:
4745
postgresql: "9.5"
48-
- node_js: "lts/carbon"
46+
- node_js: lts/dubnium
4947
addons:
5048
postgresql: "9.6"
49+
50+
# PostgreSQL 9.1 only exists on precise
51+
- node_js: lts/carbon
52+
addons:
53+
postgresql: "9.1"
54+
dist: precise

Diff for: ci_scripts/build.sh

-9
This file was deleted.

Diff for: ci_scripts/install_libpq.sh

-38
This file was deleted.

Diff for: ci_scripts/install_openssl.sh

-35
This file was deleted.

0 commit comments

Comments
 (0)