diff --git a/.travis.yml b/.travis.yml index 4f2325b4628..03bbf32ea70 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,6 +34,13 @@ jobs: - stage: Test env: DB=mysql MYSQL_VERSION=5.7 php: 7.1 + addons: + apt: + sources: + - mysql-5.7-trusty + packages: + - mysql-server + - mysql-client before_script: - ./tests/travis/install-mysql-$MYSQL_VERSION.sh sudo: required @@ -41,6 +48,13 @@ jobs: - stage: Test env: DB=mysql MYSQL_VERSION=5.7 php: 7.2 + addons: + apt: + sources: + - mysql-5.7-trusty + packages: + - mysql-server + - mysql-client before_script: - ./tests/travis/install-mysql-$MYSQL_VERSION.sh sudo: required @@ -48,6 +62,13 @@ jobs: - stage: Test env: DB=mysql MYSQL_VERSION=5.7 php: nightly + addons: + apt: + sources: + - mysql-5.7-trusty + packages: + - mysql-server + - mysql-client before_script: - ./tests/travis/install-mysql-$MYSQL_VERSION.sh sudo: required diff --git a/tests/travis/install-mysql-5.7.sh b/tests/travis/install-mysql-5.7.sh index 66b0d1ecf1f..9dbd6edfd2f 100755 --- a/tests/travis/install-mysql-5.7.sh +++ b/tests/travis/install-mysql-5.7.sh @@ -2,21 +2,7 @@ set -ex -echo "Installing MySQL 5.7..." - -sudo service mysql stop -sudo apt-get remove "^mysql.*" -sudo apt-get autoremove -sudo apt-get autoclean -echo mysql-apt-config mysql-apt-config/select-server select mysql-5.7 | sudo debconf-set-selections -wget http://dev.mysql.com/get/mysql-apt-config_0.8.6-1_all.deb -sudo DEBIAN_FRONTEND=noninteractive dpkg -i mysql-apt-config_0.8.6-1_all.deb -sudo rm -rf /var/lib/apt/lists/* -sudo apt-get clean -sudo apt-get update -q -sudo apt-get install -q -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" mysql-server libmysqlclient-dev -sudo mysql_upgrade - echo "Restart mysql..." sudo mysql -e "use mysql; update user set authentication_string=PASSWORD('') where User='root'; update user set plugin='mysql_native_password';FLUSH PRIVILEGES;" - +sudo mysql_upgrade -u root +sudo service mysql restart