From bea1df7759a06428690dad00f1fa035c98b72f14 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 19 Oct 2019 11:49:43 +0200 Subject: [ticket/16185] Add mysql, postgresql to services and use mariadb 10.1 Updated GPG key signature according to mariadb documentation. PHPBB3-16185 --- travis/setup-mariadb.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'travis') diff --git a/travis/setup-mariadb.sh b/travis/setup-mariadb.sh index 95445dcc55..2efe99cc2d 100755 --- a/travis/setup-mariadb.sh +++ b/travis/setup-mariadb.sh @@ -12,13 +12,14 @@ set -e set -x # MariaDB Series -VERSION='10.0' +VERSION='10.1' # Operating system codename, e.g. "precise" OS_CODENAME=$(lsb_release --codename --short) # Manually purge MySQL to remove conflicting files (e.g. /etc/mysql/my.cnf) sudo apt-get purge -y mysql-common +sudo rm -rf /etc/mysql && sudo rm -rf /var/log/mysql && sudo rm -rf /var/lib/mysql && sudo rm -rf /var/lib/mysql-files && sudo rm -rf /var/lib/mysql-keyring if ! which add-apt-repository > /dev/null then @@ -27,7 +28,7 @@ then fi MIRROR_DOMAIN='ftp.osuosl.org' -sudo apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 0xcbcb082a1bb943db +sudo apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 0xF1656F24C74CD1D8 sudo add-apt-repository "deb http://$MIRROR_DOMAIN/pub/mariadb/repo/$VERSION/ubuntu $OS_CODENAME main" sudo apt-get update -- cgit v1.2.1