aboutsummaryrefslogtreecommitdiffstats
path: root/travis
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2019-10-19 11:49:43 +0200
committerMarc Alexander <admin@m-a-styles.de>2019-10-19 12:14:34 +0200
commitbea1df7759a06428690dad00f1fa035c98b72f14 (patch)
treefc6e58380b694be3affe8cbb60066ee1239afcea /travis
parent5ff519c7b23edd6821d2e4e084b8adbc504d0661 (diff)
downloadforums-bea1df7759a06428690dad00f1fa035c98b72f14.tar
forums-bea1df7759a06428690dad00f1fa035c98b72f14.tar.gz
forums-bea1df7759a06428690dad00f1fa035c98b72f14.tar.bz2
forums-bea1df7759a06428690dad00f1fa035c98b72f14.tar.xz
forums-bea1df7759a06428690dad00f1fa035c98b72f14.zip
[ticket/16185] Add mysql, postgresql to services and use mariadb 10.1
Updated GPG key signature according to mariadb documentation. PHPBB3-16185
Diffstat (limited to 'travis')
-rwxr-xr-xtravis/setup-mariadb.sh5
1 files changed, 3 insertions, 2 deletions
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