From eb13694b25f7f2de922586514f586578b31fe6cb Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Fri, 18 Oct 2019 20:14:44 +0200
Subject: [PATCH 1/3] [ticket/16185] Use xenial for builds on travis
PHPBB3-16185
---
.travis.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
index be68ce8010..4fd671d174 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
language: php
-dist: trusty
+dist: xenial
matrix:
include:
From 5ff519c7b23edd6821d2e4e084b8adbc504d0661 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sat, 19 Oct 2019 11:33:55 +0200
Subject: [PATCH 2/3] [ticket/16185] Use /mode for -perm when checking
executables
The +mode notation is no longer supported and has been deprecated since 2005.
PHPBB3-16185
---
travis/check-executable-files.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/travis/check-executable-files.sh b/travis/check-executable-files.sh
index 1aa8dca073..6899373c1e 100755
--- a/travis/check-executable-files.sh
+++ b/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 \
')' \
')' \
')' \
From bea1df7759a06428690dad00f1fa035c98b72f14 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sat, 19 Oct 2019 11:49:43 +0200
Subject: [PATCH 3/3] [ticket/16185] Add mysql, postgresql to services and use
mariadb 10.1
Updated GPG key signature according to mariadb documentation.
PHPBB3-16185
---
.travis.yml | 2 ++
travis/setup-mariadb.sh | 5 +++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 4fd671d174..346d067240 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,6 +29,8 @@ matrix:
services:
- redis-server
+ - postgresql
+ - mysql
install:
- travis/setup-phpbb.sh $DB $TRAVIS_PHP_VERSION $NOTESTS
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