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

[ticket/16659] Remove special definitions for mariadb setup

Browse source 
PHPBB3-16659
This commit is contained in:
Marc Alexander 2020-12-03 17:21:53 +01:00
parent 2cdebe57af
commit 5b82ca23d3
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
3 changed files with 0 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.github/workflows/tests.yml vendored
View file

@ -66,7 +66,6 @@ jobs:
ports: ports:
- 3306:3306 - 3306:3306
options: >- options: >-
-v /srv/docker/sockets/mariadb:/var/run/mysqld
--health-cmd="mysqladmin ping" --health-cmd="mysqladmin ping"
--health-interval=10s --health-interval=10s
--health-timeout=5s --health-timeout=5s

5
travis/setup-database.sh
View file

@ -30,8 +30,3 @@ if [ "$TRAVIS_PHP_VERSION" == "5.6" -a "$DB" == "mysql" ]
then then
mysql -e 'SET GLOBAL storage_engine=MyISAM;' mysql -e 'SET GLOBAL storage_engine=MyISAM;'
fi fi
if [ "$DB" == "mariadb" ]
then
mysql -e 'create database IF NOT EXISTS phpbb_tests;'
fi

9
travis/setup-phpbb.sh
View file

@ -22,15 +22,6 @@ then
travis/setup-unbuffer.sh travis/setup-unbuffer.sh
fi fi
if [ "$DB" == "mariadb" ]
then
ls -l /var/run | grep -i mysqld
if [ ! -f "/var/run/mysqld/mysqld.sock" ]; then
ln -s /srv/docker/sockets/mariadb/mysqld.sock /var/run/mysqld/mysqld.sock
fi
fi
if [ "$MYSQL8" == '1' ] if [ "$MYSQL8" == '1' ]
then then
travis/setup-mysql8.sh travis/setup-mysql8.sh