Merge pull request #5713 from marc1706/ticket/16185

[ticket/16185] Use xenial for builds on travis

.travis.yml

@@ -1,5 +1,5 @@
 language: php
-dist: trusty
+dist: xenial
 
 matrix:
   include:
@@ -29,6 +29,8 @@ matrix:
 
 services:
   - redis-server
+  - postgresql
+  - mysql
 
 install:
   - travis/setup-phpbb.sh $DB $TRAVIS_PHP_VERSION $NOTESTS

travis/check-executable-files.sh

@@ -48,13 +48,13 @@ then
 						'('							\
 							${executable_files}		\
 						')' -a						\
-						-not -perm +100				\
+						-not -perm /100				\
 					')' -o							\
 					'('								\
 						-not '('					\
 							${executable_files}		\
 						')' -a						\
-						-perm +111					\
+						-perm /111					\
 					')'								\
 				')'									\
 			')'										\

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