From 6abae9ab1065d3a6e57ee2dca0e80f2f9e483ece Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Fri, 22 Nov 2019 18:09:22 +0100 Subject: [PATCH 1/2] Fix mysql-5.7 test case's error in Travis. See https://travis-ci.org/brianmario/mysql2/jobs/615263122#L798 ``` + add-apt-repository 'http://repo.mysql.com/apt/ubuntu mysql-5.7' + apt-get install -qq mysql-server libmysqlclient-dev ``` After adding trusty mysql-5.7 repository, mysql-5.5 is installed instead of mysql-5.7. because the Packages file is empty (zero byte). http://repo.mysql.com/apt/ubuntu/dists/trusty/mysql-5.7/binary-amd64/ xenial mysql-5.7 repository is still available. The Packages file is not empty. http://repo.mysql.com/apt/ubuntu/dists/xenial/mysql-5.7/binary-amd64/ --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index f9b098ca6..8dd50f9c6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -60,6 +60,7 @@ matrix: - mysql2gem.example.com - rvm: 2.4 env: DB=mysql57 + dist: xenial addons: hosts: - mysql2gem.example.com From 12a5e9656ef937e3f9c76a8b97a160cdc8b22f7c Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Fri, 22 Nov 2019 19:04:04 +0100 Subject: [PATCH 2/2] Fix CentOS case error in Travis. As the `mysql_install_db` script in CentOS refers wrong path of resolveip command: `/usr/libexec/resolveip`, set `ln -s /usr/bin/resolveip /usr/libexec/resolveip` as a workflow. See https://travis-ci.org/brianmario/mysql2/jobs/615263124#L2840 --- .travis_setup_centos.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.travis_setup_centos.sh b/.travis_setup_centos.sh index 631fbb9ec..78a9954c9 100644 --- a/.travis_setup_centos.sh +++ b/.travis_setup_centos.sh @@ -4,6 +4,11 @@ set -eux MYSQL_TEST_LOG="$(pwd)/mysql.log" +# mysql_install_db uses wrong path for resolveip +# https://jira.mariadb.org/browse/MDEV-18563 +# https://travis-ci.org/brianmario/mysql2/jobs/615263124#L2840 +ln -s "$(command -v resolveip)" /usr/libexec/resolveip + mysql_install_db \ --log-error="${MYSQL_TEST_LOG}" /usr/libexec/mysqld \