diff options
| author | Oliver Schramm <oliver.schramm97@gmail.com> | 2017-10-05 14:54:47 +0200 |
|---|---|---|
| committer | Oliver Schramm <oliver.schramm97@gmail.com> | 2017-10-05 14:54:47 +0200 |
| commit | 5514b1069968d451adb7eaf89278a6e1e5dc20df (patch) | |
| tree | 245b21642c134c4509e46fab60d130065e123624 /travis/setup-phpbb.sh | |
| parent | 93621aa1844ab48d9bae068d9872d2c49ae86de4 (diff) | |
| parent | ca5678cc1c2a1f723d39127e0c066eba6c9a3336 (diff) | |
| download | forums-5514b1069968d451adb7eaf89278a6e1e5dc20df.tar forums-5514b1069968d451adb7eaf89278a6e1e5dc20df.tar.gz forums-5514b1069968d451adb7eaf89278a6e1e5dc20df.tar.bz2 forums-5514b1069968d451adb7eaf89278a6e1e5dc20df.tar.xz forums-5514b1069968d451adb7eaf89278a6e1e5dc20df.zip | |
Merge pull request #4960 from rxu/ticket/15367
[ticket/15367] Escape special characters in Sphinx search backend
Diffstat (limited to 'travis/setup-phpbb.sh')
| -rwxr-xr-x | travis/setup-phpbb.sh | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/travis/setup-phpbb.sh b/travis/setup-phpbb.sh index 4daa754481..f9fd9522ca 100755 --- a/travis/setup-phpbb.sh +++ b/travis/setup-phpbb.sh @@ -13,8 +13,9 @@ set -x DB=$1 TRAVIS_PHP_VERSION=$2 +NOTESTS=$3 -if [ "$TRAVIS_PHP_VERSION" == "5.3.3" -a "$DB" == "mysqli" ] +if [ "$NOTESTS" == '1' ] then travis/setup-exiftool.sh travis/setup-unbuffer.sh @@ -25,22 +26,16 @@ then travis/setup-mariadb.sh fi -if [ "$TRAVIS_PHP_VERSION" != "hhvm" ] +if [ "$NOTESTS" != '1' -a "$TRAVIS_PHP_VERSION" != "hhvm" ] then travis/setup-php-extensions.sh fi -if [ `php -r "echo (int) version_compare(PHP_VERSION, '5.3.19', '>=');"` == "1" ] +if [ "$NOTESTS" != '1' ] then travis/setup-webserver.sh - travis/install-phpbb-test-dependencies.sh fi cd phpBB -if [ `php -r "echo (int) version_compare(PHP_VERSION, '5.3.4', '<');"` == "1" ] -then - php ../composer.phar config disable-tls true -fi php ../composer.phar install --dev --no-interaction - cd .. |