Laurent Destailleur 2 年之前
父节点
当前提交
7016e96416
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      .travis.yml

+ 2 - 2
.travis.yml

@@ -225,7 +225,7 @@ before_script:
     echo "Setting up database"
     if [ "$DB" = 'mysql' ] || [ "$DB" = 'mariadb' ] || [ "$DB" = 'postgresql' ]; then
       # Ensure we stop on error with set -e
-      set -e
+      set +e
       echo "MySQL drop database"
       mysql -u root -e 'DROP DATABASE IF EXISTS travis;'
       echo "MySQL create database"
@@ -248,7 +248,7 @@ before_script:
       mysql -u root -ppassword -e 'GRANT ALL PRIVILEGES ON travis.* TO travis@127.0.0.1;'
       echo "MySQL grant and flush"
       mysql -u root -ppassword -e 'GRANT ALL PRIVILEGES ON *.* TO root@127.0.0.1; FLUSH PRIVILEGES;'
-      sudo cat /etc/mysql/mysql.conf
+      sudo cat /etc/mysql/mysql.conf.d/mysql.conf
       sudo mysqladmin variables | grep default_authentication_plugin
       sudo sed -i -e 's/default-authentication-plugin=.*/default-authentication-plugin=mysql_native_password/g' /etc/mysql/mysql.conf.d/mysqld.conf
       sudo cat /etc/mysql/mysql.conf