From 27bee1d0bcc105c6dabea68b197cd25030acda0d Mon Sep 17 00:00:00 2001 From: Charmander <~@charmander.me> Date: Sat, 10 Dec 2016 15:16:51 -0800 Subject: [PATCH] Fix CI (#1179) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Use container-based CI * Remove unnecessary CI configuration * Use Node 6/PostgreSQL 9.6 as default test … rather than testing 0.10 twice with unspecified PostgreSQL. * Use `precise` for PostgreSQL 9.1 According to https://docs.travis-ci.com/user/database-setup/, 9.1 isn’t supported on trusty. * Fix Node 0.10 and 0.12 CI builds These binaries appear to have been built using g++ with flags that clang doesn’t support. Or something. --- .travis.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 78d7f674..74f1e4c0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,35 +1,35 @@ language: node_js -sudo: required +sudo: false dist: trusty before_script: - node script/create-test-tables.js pg://postgres@127.0.0.1:5432/postgres env: - CC=clang CXX=clang++ npm_config_clang=1 PGUSER=postgres PGDATABASE=postgres +node_js: "6" addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-4.8 + postgresql: "9.6" matrix: include: - node_js: "0.10" addons: - postgresql: "9.5" + postgresql: "9.6" + env: [] - node_js: "0.12" addons: - postgresql: "9.5" + postgresql: "9.6" + env: [] - node_js: "4" addons: - postgresql: "9.5" + postgresql: "9.6" - node_js: "5" addons: - postgresql: "9.5" + postgresql: "9.6" - node_js: "6" addons: postgresql: "9.1" + dist: precise - node_js: "6" addons: postgresql: "9.2" @@ -41,4 +41,4 @@ matrix: postgresql: "9.4" - node_js: "6" addons: - postgresql: "9.5" + postgresql: "9.5"