From df1967906fbeccf2bbe3fedf8ec35a17f14b584f Mon Sep 17 00:00:00 2001 From: Sehrope Sarkuni Date: Sat, 4 Apr 2015 11:05:20 -0400 Subject: [PATCH 1/5] Remove unused PG 9.2 Travis-CI install script --- script/travis-pg-9.2-install.sh | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100755 script/travis-pg-9.2-install.sh diff --git a/script/travis-pg-9.2-install.sh b/script/travis-pg-9.2-install.sh deleted file mode 100755 index 82ad58da..00000000 --- a/script/travis-pg-9.2-install.sh +++ /dev/null @@ -1,20 +0,0 @@ -#! /usr/bin/env bash -#sudo cat /etc/postgresql/9.1/main/pg_hba.conf -#sudo cat /etc/postgresql/9.1/main/pg_ident.conf -#sudo cat /etc/postgresql/9.1/main/postgresql.conf -sudo /etc/init.d/postgresql stop -sudo apt-get -y --purge remove postgresql -echo "yes" | sudo add-apt-repository ppa:pitti/postgresql -sudo apt-get update -qq -sudo apt-get -q -y -o Dpkg::Options::=--force-confdef install postgresql-9.2 postgresql-contrib-9.2 -sudo chmod 777 /etc/postgresql/9.2/main/pg_hba.conf -sudo echo "local all postgres trust" > /etc/postgresql/9.2/main/pg_hba.conf -sudo echo "local all all trust" >> /etc/postgresql/9.2/main/pg_hba.conf -sudo echo "host all all 127.0.0.1/32 trust" >> /etc/postgresql/9.2/main/pg_hba.conf -sudo echo "host all all ::1/128 trust" >> /etc/postgresql/9.2/main/pg_hba.conf -sudo echo "host all all 0.0.0.0/0 trust" >> /etc/postgresql/9.2/main/pg_hba.conf -sudo echo "host all all 0.0.0.0 255.255.255.255 trust" >> /etc/postgresql/9.2/main/pg_hba.conf -sudo /etc/init.d/postgresql restart -# for some reason both postgres 9.1 and 9.2 are started -# 9.2 is running on port 5433 -node script/create-test-tables.js postgres://postgres@localhost:5433/postgres From 180f5f7d8466a011bda852a8cd64faed070b1e70 Mon Sep 17 00:00:00 2001 From: Sehrope Sarkuni Date: Sat, 4 Apr 2015 10:26:21 -0400 Subject: [PATCH 2/5] Add node/PostgreSQL matrix to .travis.yml Add a matrix configuration to .travis.yml to test permutations of node and PostgreSQL. Node versions tested against are v0.10, v0.11, v0.12 and io.js v1. PostgreSQL versions tested against are 9.1, 9.2, 9.3, and 9.4. --- .travis.yml | 55 +++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 51 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 90d45fb9..51dfbfa8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,56 @@ language: node_js -node_js: - - "0.10" - - "0.12" - - "iojs" before_script: - node script/create-test-tables.js pg://postgres@127.0.0.1:5432/postgres env: - PGUSER=postgres PGDATABASE=postgres + +matrix: + include: + - node_js: "0.10" + addons: + postgresql: "9.1" + - node_js: "0.10" + addons: + postgresql: "9.2" + - node_js: "0.10" + addons: + postgresql: "9.3" + - node_js: "0.10" + addons: + postgresql: "9.4" + - node_js: "0.11" + addons: + postgresql: "9.1" + - node_js: "0.11" + addons: + postgresql: "9.2" + - node_js: "0.11" + addons: + postgresql: "9.3" + - node_js: "0.11" + addons: + postgresql: "9.4" + - node_js: "0.12" + addons: + postgresql: "9.1" + - node_js: "0.12" + addons: + postgresql: "9.2" + - node_js: "0.12" + addons: + postgresql: "9.3" + - node_js: "0.12" + addons: + postgresql: "9.4" + - node_js: "iojs-v1" + addons: + postgresql: "9.1" + - node_js: "iojs-v1" + addons: + postgresql: "9.2" + - node_js: "iojs-v1" + addons: + postgresql: "9.3" + - node_js: "iojs-v1" + addons: + postgresql: "9.4" From 7a09283fe7dab7d315027401a0dfdbb50e31117a Mon Sep 17 00:00:00 2001 From: Sehrope Sarkuni Date: Sun, 2 Aug 2015 10:50:27 -0400 Subject: [PATCH 3/5] Remove node v0.11 from Travis matrix --- .travis.yml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 51dfbfa8..8bf64153 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,18 +18,6 @@ matrix: - node_js: "0.10" addons: postgresql: "9.4" - - node_js: "0.11" - addons: - postgresql: "9.1" - - node_js: "0.11" - addons: - postgresql: "9.2" - - node_js: "0.11" - addons: - postgresql: "9.3" - - node_js: "0.11" - addons: - postgresql: "9.4" - node_js: "0.12" addons: postgresql: "9.1" From e98ef2f78433cfcf33d4f8941ad49310f9092b87 Mon Sep 17 00:00:00 2001 From: Sehrope Sarkuni Date: Sun, 2 Aug 2015 10:51:02 -0400 Subject: [PATCH 4/5] Disable sudo in .travis.yml This enables container based builds on Travis which should speed up automated testing. --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 8bf64153..8e3b02e7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ language: node_js +sudo: false before_script: - node script/create-test-tables.js pg://postgres@127.0.0.1:5432/postgres env: From 8ce6811f40c959f20108b738f4dfc719e7578eff Mon Sep 17 00:00:00 2001 From: Sehrope Sarkuni Date: Sun, 2 Aug 2015 10:58:38 -0400 Subject: [PATCH 5/5] Bump iojs version in Travis matrix to iojs-v2 --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8e3b02e7..8fd80a01 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,15 +31,15 @@ matrix: - node_js: "0.12" addons: postgresql: "9.4" - - node_js: "iojs-v1" + - node_js: "iojs-v2" addons: postgresql: "9.1" - - node_js: "iojs-v1" + - node_js: "iojs-v2" addons: postgresql: "9.2" - - node_js: "iojs-v1" + - node_js: "iojs-v2" addons: postgresql: "9.3" - - node_js: "iojs-v1" + - node_js: "iojs-v2" addons: postgresql: "9.4"