mirror of
https://github.com/phpbb/phpbb.git
synced 2025-04-13 04:13:29 +02:00
[ticket/16659] Remove special definitions for mariadb setup
PHPBB3-16659
This commit is contained in:
parent
2cdebe57af
commit
5b82ca23d3
1
.github/workflows/tests.yml
vendored
1
.github/workflows/tests.yml
vendored
@ -66,7 +66,6 @@ jobs:
|
||||
ports:
|
||||
- 3306:3306
|
||||
options: >-
|
||||
-v /srv/docker/sockets/mariadb:/var/run/mysqld
|
||||
--health-cmd="mysqladmin ping"
|
||||
--health-interval=10s
|
||||
--health-timeout=5s
|
||||
|
@ -30,8 +30,3 @@ if [ "$TRAVIS_PHP_VERSION" == "5.6" -a "$DB" == "mysql" ]
|
||||
then
|
||||
mysql -e 'SET GLOBAL storage_engine=MyISAM;'
|
||||
fi
|
||||
|
||||
if [ "$DB" == "mariadb" ]
|
||||
then
|
||||
mysql -e 'create database IF NOT EXISTS phpbb_tests;'
|
||||
fi
|
||||
|
@ -22,15 +22,6 @@ then
|
||||
travis/setup-unbuffer.sh
|
||||
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' ]
|
||||
then
|
||||
travis/setup-mysql8.sh
|
||||
|
Loading…
x
Reference in New Issue
Block a user