From 27c7e3cb7e89c7ec97bfbf92719ca584da6dfa00 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 5 Dec 2015 23:45:08 +0100 Subject: [PATCH] Try to solve mysql pb with new travis --- .travis.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1769f2f0504..2a2cde4ee0f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -76,20 +76,20 @@ before_script: # (https://github.com/piwik/piwik/commit/20bd2e1c24e5d673dce3feb256204ad48c29f160) # TODO: Remove when mysql 5.6 is provided by travis. # Otherwise, our migrations will raise a syntax error. - - "sudo apt-get remove mysql-common mysql-server-5.5 mysql-server-core-5.5 mysql-client-5.5 mysql-client-core-5.5" - - "sudo apt-get autoremove" - - "sudo apt-get install libaio1" - - "wget -O mysql-5.6.14.deb http://dev.mysql.com/get/Downloads/MySQL-5.6/mysql-5.6.14-debian6.0-x86_64.deb/from/http://cdn.mysql.com/" - - "sudo dpkg -i mysql-5.6.14.deb" - - "sudo cp /opt/mysql/server-5.6/support-files/mysql.server /etc/init.d/mysql.server" - - "sudo ln -s /opt/mysql/server-5.6/bin/* /usr/bin/" - - "sudo sed -i'' 's/table_cache/table_open_cache/' /etc/mysql/my.cnf" - - "sudo sed -i'' 's/log_slow_queries/slow_query_log/' /etc/mysql/my.cnf" - - "sudo sed -i'' 's/basedir[^=]\\+=.*$/basedir = \\/opt\\/mysql\\/server-5.6/' /etc/mysql/my.cnf" - - "sudo /etc/init.d/mysql.server start" +# - "sudo apt-get remove mysql-common mysql-server-5.5 mysql-server-core-5.5 mysql-client-5.5 mysql-client-core-5.5" +# - "sudo apt-get autoremove" +# - "sudo apt-get install libaio1" +# - "wget -O mysql-5.6.14.deb http://dev.mysql.com/get/Downloads/MySQL-5.6/mysql-5.6.14-debian6.0-x86_64.deb/from/http://cdn.mysql.com/" +# - "sudo dpkg -i mysql-5.6.14.deb" +# - "sudo cp /opt/mysql/server-5.6/support-files/mysql.server /etc/init.d/mysql.server" +# - "sudo ln -s /opt/mysql/server-5.6/bin/* /usr/bin/" +# - "sudo sed -i'' 's/table_cache/table_open_cache/' /etc/mysql/my.cnf" +# - "sudo sed -i'' 's/log_slow_queries/slow_query_log/' /etc/mysql/my.cnf" +# - "sudo sed -i'' 's/basedir[^=]\\+=.*$/basedir = \\/opt\\/mysql\\/server-5.6/' /etc/mysql/my.cnf" +# - "sudo /etc/init.d/mysql.server start" + # /END MYSQL 5.6- mysql --version - mysql --version - mysql -e "SELECT VERSION();" - # /END MYSQL 5.6- mysql --version - echo Init database - 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"