Merge pull request #1085 from junaruga/hotfix/fix-travis-ci

Fix Travis CI errors on mysql-5.7 and CentOS cases
brianmario · Nov 22, 2019 · 5f7a271 · 5f7a271
2 parents 46369c0 + 12a5e96
commit 5f7a271
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git 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

diff --git 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 \