makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.3.x'

Browse source
This commit is contained in:
Marc Alexander 2019-10-19 14:06:52 +02:00
commit 9949e27c27
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.travis.yml
View file

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

4
travis/check-executable-files.sh
View file

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

5
travis/setup-mariadb.sh
View file

@ -12,13 +12,14 @@ set -e
set -x set -x
# MariaDB Series # MariaDB Series
VERSION='10.0' VERSION='10.1'
# Operating system codename, e.g. "precise" # Operating system codename, e.g. "precise"
OS_CODENAME=$(lsb_release --codename --short) OS_CODENAME=$(lsb_release --codename --short)
# Manually purge MySQL to remove conflicting files (e.g. /etc/mysql/my.cnf) # Manually purge MySQL to remove conflicting files (e.g. /etc/mysql/my.cnf)
sudo apt-get purge -y mysql-common 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 if ! which add-apt-repository > /dev/null
then then
@ -27,7 +28,7 @@ then
fi fi
MIRROR_DOMAIN='ftp.osuosl.org' 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 add-apt-repository "deb http://$MIRROR_DOMAIN/pub/mariadb/repo/$VERSION/ubuntu $OS_CODENAME main"
sudo apt-get update sudo apt-get update