From d004b14c73a77dcd4dcf1cd9dabb4e5ecb04d86d Mon Sep 17 00:00:00 2001 From: Remi Gacogne Date: Fri, 2 Dec 2016 17:05:42 +0100 Subject: [PATCH] MySQL 5.6 is now installed by default in travis images See https://github.com/travis-ci/travis-ci/issues/6961 --- build-scripts/travis.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/build-scripts/travis.sh b/build-scripts/travis.sh index 954126a60..3e0e40d73 100755 --- a/build-scripts/travis.sh +++ b/build-scripts/travis.sh @@ -271,8 +271,10 @@ install_auth() { geoip-database" # gmysql-backend test requirements - run "sudo apt-get -qq --no-install-recommends install \ - mysql-server" + # as of 2016/12/01, mysql-5.6 is now installed in the default travis image + # see https://github.com/travis-ci/travis-ci/issues/6961 + #run "sudo apt-get -qq --no-install-recommends install \ + # mysql-server" # godbc-backend test setup run 'echo -e "[pdns-sqlite3-1]\nDriver = SQLite3\nDatabase = ${PWD}/regression-tests/pdns.sqlite3\n\n[pdns-sqlite3-2]\nDriver = SQLite3\nDatabase = ${PWD}/regression-tests/pdns.sqlite32\n" > ${HOME}/.odbc.ini' -- 2.49.0