From 8e42a6fd159fd29b68ee3708e42a6f9e08c02c2b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 19 Oct 2013 14:11:56 +0200 Subject: [PATCH 01/10] Avoid email when travis is ok --- .travis.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.travis.yml b/.travis.yml index 6bee6a229b2..c6f3b43c447 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,11 @@ # Command run is phpunit # For syntax, see http://about.travis-ci.org/docs/user/languages/php/ +notifications: + email: + on_success: never # [always|never|change] default: change + on_failure: always # [always|never|change] default: always + services: - memcached # will start memcached From f87afaac108d6ab2c482165f3d057a431d82f0b2 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 19 Oct 2013 14:38:49 +0200 Subject: [PATCH 02/10] Suggest a better page name --- htdocs/install/mysql/tables/llx_actioncomm.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/install/mysql/tables/llx_actioncomm.sql b/htdocs/install/mysql/tables/llx_actioncomm.sql index ea70aa02385..906188d8ceb 100644 --- a/htdocs/install/mysql/tables/llx_actioncomm.sql +++ b/htdocs/install/mysql/tables/llx_actioncomm.sql @@ -44,9 +44,9 @@ create table llx_actioncomm fk_contact integer, fk_parent integer NOT NULL default 0, - fk_user_action integer, -- user id of owner of action (currently also user id of actor that must do action. In future, actors assigned to action will be an array into table llx_actioncomm_actors) + fk_user_action integer, -- user id of owner of action (currently also user id of actor that must do action. In future, actors assigned to action will be an array into table llx_actioncomm_resources) - transparency integer, -- transparency (ical standard). used to say if people assigned to event are busy or not by event (in future version, this field is deprecated and will be stored into table llx_actioncomm_actors) + transparency integer, -- transparency (ical standard). used to say if people assigned to event are busy or not by event (in future version, this field is deprecated and will be stored into table llx_actioncomm_resources) fk_user_done integer, -- user id of people that has made action (deprecated) priority smallint, From 4f39632937a4c043d74266c0a92167904303dea5 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 19 Oct 2013 14:39:12 +0200 Subject: [PATCH 03/10] Add more PHP versions into travis CI --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index b2bfebd91db..cf608f7f230 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,8 +9,10 @@ services: # This will tell travis to run phpunit language: php php: + - "5.2" - "5.3" - "5.4" + - "5.5" env: - DB=mysql From db9a329c1deb987cb9bf7889ccb0696a672bd310 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 19 Oct 2013 15:04:54 +0200 Subject: [PATCH 04/10] Remove PHP 5.2 from travis. Travis not ready for this. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index cf608f7f230..0a9c00a36a0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ services: # This will tell travis to run phpunit language: php php: - - "5.2" +# - "5.2" is not supported because pyrus to install PHP_Codesniffer is not available - "5.3" - "5.4" - "5.5" From c244992abd2548ee49a30c4b812591ffc6b9c70c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 19 Oct 2013 15:22:51 +0200 Subject: [PATCH 05/10] Add php version info into travis output --- .travis.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 699d2e8bc22..d142e476fea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,9 @@ before_script: - echo Start travis - echo Current dir is `pwd` - echo Home dir is `echo ~` - - echo Update composer + - export PHPV=`phpenv version-name` + - echo PHP version $PHPV +# - echo Update composer # - ~/.phpenv/versions/$(phpenv version-name)/bin/composer.phar self-update - echo Install phpcs then show installed rules - pyrus install pear/PHP_CodeSniffer @@ -42,7 +44,8 @@ before_script: - find $(pwd)/htdocs/documents -type d -exec ls -alt {} \; - echo Edit php.ini file - echo 'date.timezone = "Europe/Paris"' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini - - echo "extension = apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini + - sh -c "if [ '$DB' = '5.3' ]; then echo "extension = apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini + - sh -c "if [ '$DB' = '5.4' ]; then echo "extension = apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini # - echo "extension = memcache.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini - echo "extension = memcached.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini - echo "zend_extension_ts = xdebug.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini From d7020c6f503c6679fa8510159b633152c373023c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 19 Oct 2013 15:25:12 +0200 Subject: [PATCH 06/10] Build php ini according to PHP version --- .travis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index d142e476fea..dd803f5dd8a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,11 +44,12 @@ before_script: - find $(pwd)/htdocs/documents -type d -exec ls -alt {} \; - echo Edit php.ini file - echo 'date.timezone = "Europe/Paris"' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini - - sh -c "if [ '$DB' = '5.3' ]; then echo "extension = apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini - - sh -c "if [ '$DB' = '5.4' ]; then echo "extension = apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini + - sh -c "if [ '$PHPV' = '5.3' ]; then echo "extension = apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini + - sh -c "if [ '$PHPV' = '5.4' ]; then echo "extension = apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini # - echo "extension = memcache.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini - echo "extension = memcached.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini - - echo "zend_extension_ts = xdebug.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini + - sh -c "if [ '$PHPV' = '5.3' ]; then - echo "zend_extension_ts = xdebug.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini + - sh -c "if [ '$PHPV' = '5.4' ]; then - echo "zend_extension_ts = xdebug.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini - cat ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini - echo Init database - sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'DROP DATABASE IF EXISTS myapp_test;' -U postgres; fi" From 9e0a7799895ab2ee88eba9e224dce1a094570c79 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 19 Oct 2013 15:27:09 +0200 Subject: [PATCH 07/10] Syntax error --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index dd803f5dd8a..5daaa006730 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,12 +44,12 @@ before_script: - find $(pwd)/htdocs/documents -type d -exec ls -alt {} \; - echo Edit php.ini file - echo 'date.timezone = "Europe/Paris"' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini - - sh -c "if [ '$PHPV' = '5.3' ]; then echo "extension = apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini - - sh -c "if [ '$PHPV' = '5.4' ]; then echo "extension = apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini # - echo "extension = memcache.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini - echo "extension = memcached.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini - - sh -c "if [ '$PHPV' = '5.3' ]; then - echo "zend_extension_ts = xdebug.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini - - sh -c "if [ '$PHPV' = '5.4' ]; then - echo "zend_extension_ts = xdebug.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini + - sh -c "if [ '$PHPV' = '5.3' ]; then echo "extension = apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini" + - sh -c "if [ '$PHPV' = '5.4' ]; then echo "extension = apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini" + - sh -c "if [ '$PHPV' = '5.3' ]; then - echo "zend_extension_ts = xdebug.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini" + - sh -c "if [ '$PHPV' = '5.4' ]; then - echo "zend_extension_ts = xdebug.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini" - cat ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini - echo Init database - sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'DROP DATABASE IF EXISTS myapp_test;' -U postgres; fi" From 0707409684d1141a6e15a68ef7909481a9471f3c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 19 Oct 2013 15:28:58 +0200 Subject: [PATCH 08/10] Another syntax error --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5daaa006730..90cfc8a5b91 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,10 +46,10 @@ before_script: - echo 'date.timezone = "Europe/Paris"' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini # - echo "extension = memcache.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini - echo "extension = memcached.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini - - sh -c "if [ '$PHPV' = '5.3' ]; then echo "extension = apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini" - - sh -c "if [ '$PHPV' = '5.4' ]; then echo "extension = apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini" - - sh -c "if [ '$PHPV' = '5.3' ]; then - echo "zend_extension_ts = xdebug.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini" - - sh -c "if [ '$PHPV' = '5.4' ]; then - echo "zend_extension_ts = xdebug.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini" + - sh -c "if [ '$PHPV' = '5.3' ]; then echo "extension = apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi" + - sh -c "if [ '$PHPV' = '5.4' ]; then echo "extension = apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi" + - sh -c "if [ '$PHPV' = '5.3' ]; then - echo "zend_extension_ts = xdebug.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi" + - sh -c "if [ '$PHPV' = '5.4' ]; then - echo "zend_extension_ts = xdebug.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi" - cat ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini - echo Init database - sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'DROP DATABASE IF EXISTS myapp_test;' -U postgres; fi" From c02a0cbb9562f70bc98808fa306a2175434a99c6 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 19 Oct 2013 15:31:08 +0200 Subject: [PATCH 09/10] Conflict betwen ' and " --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 90cfc8a5b91..c0385bff31e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,10 +46,10 @@ before_script: - echo 'date.timezone = "Europe/Paris"' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini # - echo "extension = memcache.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini - echo "extension = memcached.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini - - sh -c "if [ '$PHPV' = '5.3' ]; then echo "extension = apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi" - - sh -c "if [ '$PHPV' = '5.4' ]; then echo "extension = apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi" - - sh -c "if [ '$PHPV' = '5.3' ]; then - echo "zend_extension_ts = xdebug.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi" - - sh -c "if [ '$PHPV' = '5.4' ]; then - echo "zend_extension_ts = xdebug.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi" + - sh -c "if [ '$PHPV' = '5.3' ]; then echo 'extension = apc.so' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi" + - sh -c "if [ '$PHPV' = '5.4' ]; then echo 'extension = apc.so' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi" + - sh -c "if [ '$PHPV' = '5.3' ]; then - echo 'zend_extension_ts = xdebug.so' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi" + - sh -c "if [ '$PHPV' = '5.4' ]; then - echo 'zend_extension_ts = xdebug.so' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi" - cat ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini - echo Init database - sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'DROP DATABASE IF EXISTS myapp_test;' -U postgres; fi" From 586062a911579c2dc51f844151184d9702014e69 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 19 Oct 2013 15:34:18 +0200 Subject: [PATCH 10/10] Fix: syntax error --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index c0385bff31e..efa6b3f28fc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,8 +48,8 @@ before_script: - echo "extension = memcached.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini - sh -c "if [ '$PHPV' = '5.3' ]; then echo 'extension = apc.so' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi" - sh -c "if [ '$PHPV' = '5.4' ]; then echo 'extension = apc.so' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi" - - sh -c "if [ '$PHPV' = '5.3' ]; then - echo 'zend_extension_ts = xdebug.so' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi" - - sh -c "if [ '$PHPV' = '5.4' ]; then - echo 'zend_extension_ts = xdebug.so' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi" + - sh -c "if [ '$PHPV' = '5.3' ]; then echo 'zend_extension_ts = xdebug.so' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi" + - sh -c "if [ '$PHPV' = '5.4' ]; then echo 'zend_extension_ts = xdebug.so' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi" - cat ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini - echo Init database - sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'DROP DATABASE IF EXISTS myapp_test;' -U postgres; fi"