From 1b17b3b98a5a75ff35009f4f4534fa35b89650b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steve=20M=C3=BCller?= Date: Mon, 6 Jan 2014 19:59:03 +0100 Subject: [PATCH 1/2] add travis build matrix for all built-in PostgreSQL versions --- .travis.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 88bf7cf6347..7ef9cf3f11a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,10 +8,14 @@ php: env: - DB=mysql ENABLE_SECOND_LEVEL_CACHE=1 - - DB=pgsql ENABLE_SECOND_LEVEL_CACHE=1 + - DB=pgsql ENABLE_SECOND_LEVEL_CACHE=1 POSTGRESQL_VERSION=9.1 + - DB=pgsql ENABLE_SECOND_LEVEL_CACHE=1 POSTGRESQL_VERSION=9.2 + - DB=pgsql ENABLE_SECOND_LEVEL_CACHE=1 POSTGRESQL_VERSION=9.3 - DB=sqlite ENABLE_SECOND_LEVEL_CACHE=1 - DB=mysql ENABLE_SECOND_LEVEL_CACHE=0 - - DB=pgsql ENABLE_SECOND_LEVEL_CACHE=0 + - DB=pgsql ENABLE_SECOND_LEVEL_CACHE=0 POSTGRESQL_VERSION=9.1 + - DB=pgsql ENABLE_SECOND_LEVEL_CACHE=0 POSTGRESQL_VERSION=9.2 + - DB=pgsql ENABLE_SECOND_LEVEL_CACHE=0 POSTGRESQL_VERSION=9.3 - DB=sqlite ENABLE_SECOND_LEVEL_CACHE=0 before_script: @@ -19,6 +23,7 @@ before_script: - sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'DROP DATABASE IF EXISTS doctrine_tests_tmp;' -U postgres; fi" - sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'create database doctrine_tests;' -U postgres; fi" - sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'create database doctrine_tests_tmp;' -U postgres; fi" + - sh -c "if [ '$DB' = 'pgsql' ]; then sudo service postgresql stop; sudo service postgresql start $POSTGRESQL_VERSION; fi" - sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'create database IF NOT EXISTS doctrine_tests_tmp;create database IF NOT EXISTS doctrine_tests;'; fi" - composer install --prefer-dist --dev From fd8b8ced00eabe89b25c8c91c6aa38da5786ff6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steve=20M=C3=BCller?= Date: Wed, 8 Jan 2014 20:28:51 +0100 Subject: [PATCH 2/2] add travis build matrix for all built-in PostgreSQL versions --- .travis.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7ef9cf3f11a..56a545742b1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,9 +37,17 @@ matrix: - php: hhvm exclude: - php: hhvm - env: DB=pgsql ENABLE_SECOND_LEVEL_CACHE=0 # driver currently unsupported by HHVM + env: DB=pgsql ENABLE_SECOND_LEVEL_CACHE=0 POSTGRESQL_VERSION=9.1 # driver currently unsupported by HHVM - php: hhvm - env: DB=pgsql ENABLE_SECOND_LEVEL_CACHE=1 # driver currently unsupported by HHVM + env: DB=pgsql ENABLE_SECOND_LEVEL_CACHE=1 POSTGRESQL_VERSION=9.1 # driver currently unsupported by HHVM + - php: hhvm + env: DB=pgsql ENABLE_SECOND_LEVEL_CACHE=0 POSTGRESQL_VERSION=9.2 # driver currently unsupported by HHVM + - php: hhvm + env: DB=pgsql ENABLE_SECOND_LEVEL_CACHE=1 POSTGRESQL_VERSION=9.2 # driver currently unsupported by HHVM + - php: hhvm + env: DB=pgsql ENABLE_SECOND_LEVEL_CACHE=0 POSTGRESQL_VERSION=9.3 # driver currently unsupported by HHVM + - php: hhvm + env: DB=pgsql ENABLE_SECOND_LEVEL_CACHE=1 POSTGRESQL_VERSION=9.3 # driver currently unsupported by HHVM - php: hhvm env: DB=mysqli ENABLE_SECOND_LEVEL_CACHE=0 # driver currently unsupported by HHVM - php: hhvm