mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-05 08:17:47 +02:00
Code Issues Releases Wiki Activity

[ticket/16659] Enable mariadb tests

Browse Source 
PHPBB3-16659
This commit is contained in:
Marc Alexander
2020-12-01 21:28:12 +01:00
parent d764888393
commit 5cbe25d415
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/tests.yml vendored
View File

@@ -24,8 +24,8 @@ jobs:
# db: "mariadb:10.1" # db: "mariadb:10.1"
# - php: 7.1 # - php: 7.1
# db: "mariadb:10.2" # db: "mariadb:10.2"
# - php: 7.1 - php: 7.1
# db: "mariadb:10.3" db: "mariadb:10.3"
# - php: 7.1 # - php: 7.1
# db: "mariadb:10.4" # db: "mariadb:10.4"
# - php: 7.1 # - php: 7.1
@@ -59,7 +59,7 @@ jobs:
services: services:
mysql: mysql:
image: ${{ matrix.db != 'mysql:5.6' && matrix.db != 'mysql:5.7' && matrix.db != 'mysql:8.0' && 'mysql:5.7' || matrix.db }} image: ${{ matrix.db != 'mysql:5.6' && matrix.db != 'mysql:5.7' && matrix.db != 'mysql:8.0' && matrix.db != 'mariadb:10.1' && matrix.db != 'mariadb:10.2' && matrix.db != 'mariadb:10.3' && matrix.db != 'mariadb:10.4' && matrix.db != 'mariadb:10.5' && 'mysql:5.7' || matrix.db }}
env: env:
MYSQL_ALLOW_EMPTY_PASSWORD: yes MYSQL_ALLOW_EMPTY_PASSWORD: yes
MYSQL_DATABASE: phpbb_tests MYSQL_DATABASE: phpbb_tests

5
travis/setup-phpbb.sh
View File

@@ -22,11 +22,6 @@ then
travis/setup-unbuffer.sh travis/setup-unbuffer.sh
fi fi
if [ "$DB" == "mariadb" ]
then
travis/setup-mariadb.sh
fi
if [ "$MYSQL8" == '1' ] if [ "$MYSQL8" == '1' ]
then then
travis/setup-mysql8.sh travis/setup-mysql8.sh