From 97db4a7f13471c5a9dc5247a074226f4b250cf84 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 8 Sep 2013 23:46:42 +0200 Subject: [PATCH] Fix: syntax error on travis rule file. --- .travis.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 75b1812b2e0..d64fc9eb268 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ php: env: - DB=mysql - - DB=postgres +# - DB=postgres before_script: - echo Start travis @@ -20,15 +20,14 @@ before_script: - echo "extension = memcached.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini - echo "extension = xdebug.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini - echo Init database - - mysql -e 'create database myapp_test;' - sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'DROP DATABASE IF EXISTS myapp_test;' -U postgres; fi" - sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'create database myapp_test;' -U postgres; fi" - sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'DROP DATABASE IF EXISTS myapp_test;' -U postgres; fi" - sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'create database IF NOT EXISTS myapp_test;'; fi" - echo Create config file - echo ' htdocs/conf/conf.php - - sh -c "if [ '$DB' = 'pgsql' ]; then echo '$dolibarr_main_db_type=\'pgsql\';' >> htdocs/conf/conf.php - - sh -c "if [ '$DB' = 'mysql' ]; then echo '$dolibarr_main_db_type=\'mysqli\';' >> htdocs/conf/conf.php + - sh -c "if [ '$DB' = 'pgsql' ]; then echo '$dolibarr_main_db_type=\'pgsql\';' >> htdocs/conf/conf.php; fi" + - sh -c "if [ '$DB' = 'mysql' ]; then echo '$dolibarr_main_db_type=\'mysqli\';' >> htdocs/conf/conf.php; fi" - echo '$dolibarr_main_db_host=\'localhost\';' >> htdocs/conf/conf.php - echo '$dolibarr_main_db_name=\'myapp_test\';' >> htdocs/conf/conf.php - echo '$dolibarr_main_db_user=\'travis\';' >> htdocs/conf/conf.php