mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-01-17 22:28:46 +01:00
Code Issues Releases Wiki Activity

[ticket/12592] Rename mysql environment to mysqli.

Browse Source 
PHPBB3-12592
This commit is contained in:
Andreas Fischer 2014-05-26 18:49:29 +02:00
parent 26674bff39
commit c0dc0fc09b
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -8,7 +8,7 @@ php:
- hhvm - hhvm
env: env:
- DB=mysql - DB=mysqli
services: services:
- redis-server - redis-server
@ -22,7 +22,7 @@ before_script:
script: script:
- travis/phing-sniff.sh $DB $TRAVIS_PHP_VERSION - travis/phing-sniff.sh $DB $TRAVIS_PHP_VERSION
- phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml - phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml
- sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.5' -a '$DB' = 'mysql' -a '$TRAVIS_PULL_REQUEST' != 'false' ]; then git-tools/commit-msg-hook-range.sh origin/$TRAVIS_BRANCH..FETCH_HEAD; fi" - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.5' -a '$DB' = 'mysqli' -a '$TRAVIS_PULL_REQUEST' != 'false' ]; then git-tools/commit-msg-hook-range.sh origin/$TRAVIS_BRANCH..FETCH_HEAD; fi"
matrix: matrix:
include: include:

2
travis/phing-sniff.sh
View File

@ -9,7 +9,7 @@ set -x
DB=$1 DB=$1
TRAVIS_PHP_VERSION=$2 TRAVIS_PHP_VERSION=$2
if [ "$TRAVIS_PHP_VERSION" == "5.5" -a "$DB" == "mysql" ] if [ "$TRAVIS_PHP_VERSION" == "5.5" -a "$DB" == "mysqli" ]
then then
cd build cd build
../phpBB/vendor/bin/phing sniff ../phpBB/vendor/bin/phing sniff

0
travis/phpunit-mysql-travis.xml → travis/phpunit-mysqli-travis.xml
View File

4
travis/setup-database.sh
View File

@ -15,12 +15,12 @@ then
psql -c 'create database phpbb_tests;' -U postgres psql -c 'create database phpbb_tests;' -U postgres
fi fi
if [ "$TRAVIS_PHP_VERSION" == "5.3" -a "$DB" == "mysql" ] if [ "$TRAVIS_PHP_VERSION" == "5.3" -a "$DB" == "mysqli" ]
then then
mysql -e 'SET GLOBAL storage_engine=MyISAM;' mysql -e 'SET GLOBAL storage_engine=MyISAM;'
fi fi
if [ "$DB" == "mysql" -o "$DB" == "mariadb" ] if [ "$DB" == "mysqli" -o "$DB" == "mariadb" ]
then then
mysql -e 'create database IF NOT EXISTS phpbb_tests;' mysql -e 'create database IF NOT EXISTS phpbb_tests;'
fi fi