diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-09-28 17:40:24 +0200 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-10-04 16:19:48 +0200 |
| commit | f3dc2a801d7e077e5e10a143b8d450b0b4a3aa11 (patch) | |
| tree | df362ae768224100e004c6a0f40ee21f7c7cf68f /travis | |
| parent | a342517dfb877e6d1cb0b489f7caa6f54e12bca5 (diff) | |
| download | forums-f3dc2a801d7e077e5e10a143b8d450b0b4a3aa11.tar forums-f3dc2a801d7e077e5e10a143b8d450b0b4a3aa11.tar.gz forums-f3dc2a801d7e077e5e10a143b8d450b0b4a3aa11.tar.bz2 forums-f3dc2a801d7e077e5e10a143b8d450b0b4a3aa11.tar.xz forums-f3dc2a801d7e077e5e10a143b8d450b0b4a3aa11.zip | |
[ticket/14205] Bump PHP requirement to PHP 5.4
PHPBB3-14205
Diffstat (limited to 'travis')
| -rwxr-xr-x | travis/check-executable-files.sh | 5 | ||||
| -rwxr-xr-x | travis/check-image-icc-profiles.sh | 3 | ||||
| -rwxr-xr-x | travis/check-sami-parse-errors.sh | 3 | ||||
| -rwxr-xr-x | travis/ext-sniff.sh | 2 | ||||
| -rwxr-xr-x | travis/phing-sniff.sh | 3 | ||||
| -rwxr-xr-x | travis/setup-database.sh | 8 | ||||
| -rwxr-xr-x | travis/setup-phpbb.sh | 7 |
7 files changed, 21 insertions, 10 deletions
diff --git a/travis/check-executable-files.sh b/travis/check-executable-files.sh index e1a1625d18..4ec037e6ce 100755 --- a/travis/check-executable-files.sh +++ b/travis/check-executable-files.sh @@ -12,10 +12,11 @@ set -e DB=$1 TRAVIS_PHP_VERSION=$2 -root="$3" +NOTESTS=$3 +root="$4" path="${root}phpBB/" -if [ "$TRAVIS_PHP_VERSION" == "5.3" -a "$DB" == "mysqli" ] +if [ "$NOTESTS" == '1' ] then # Check the permissions of the files diff --git a/travis/check-image-icc-profiles.sh b/travis/check-image-icc-profiles.sh index df13c5f4e2..05c7de2d27 100755 --- a/travis/check-image-icc-profiles.sh +++ b/travis/check-image-icc-profiles.sh @@ -12,8 +12,9 @@ set -e DB=$1 TRAVIS_PHP_VERSION=$2 +NOTESTS=$3 -if [ "$TRAVIS_PHP_VERSION" == "5.3" -a "$DB" == "mysqli" ] +if [ "$NOTESTS" == '1' ] then find . -type f -a -iregex '.*\.\(gif\|jpg\|jpeg\|png\)$' -a -not -wholename '*vendor/*' | \ parallel --gnu --keep-order 'phpBB/develop/strip_icc_profiles.sh {}' diff --git a/travis/check-sami-parse-errors.sh b/travis/check-sami-parse-errors.sh index 84976a7666..4cc2cee525 100755 --- a/travis/check-sami-parse-errors.sh +++ b/travis/check-sami-parse-errors.sh @@ -12,8 +12,9 @@ set -e DB=$1 TRAVIS_PHP_VERSION=$2 +NOTESTS=$3 -if [ "$TRAVIS_PHP_VERSION" == "5.3" -a "$DB" == "mysqli" ] +if [ "$NOTESTS" == '1' ] then # Workarounds for # https://github.com/fabpot/Sami/issues/116 diff --git a/travis/ext-sniff.sh b/travis/ext-sniff.sh index 4e557a41c1..61ceda6834 100755 --- a/travis/ext-sniff.sh +++ b/travis/ext-sniff.sh @@ -10,7 +10,7 @@ # set -e set -x - + DB=$1 TRAVIS_PHP_VERSION=$2 EXTNAME=$3 diff --git a/travis/phing-sniff.sh b/travis/phing-sniff.sh index 660d1764c2..3f43b64130 100755 --- a/travis/phing-sniff.sh +++ b/travis/phing-sniff.sh @@ -13,8 +13,9 @@ set -x DB=$1 TRAVIS_PHP_VERSION=$2 +NOTESTS=$3 -if [ "$TRAVIS_PHP_VERSION" == "5.5" -a "$DB" == "mysqli" ] +if [ "$NOTESTS" == '1' ] then cd build ../phpBB/vendor/bin/phing sniff diff --git a/travis/setup-database.sh b/travis/setup-database.sh index 4ba9157d9d..3771f19073 100755 --- a/travis/setup-database.sh +++ b/travis/setup-database.sh @@ -13,6 +13,12 @@ set -x DB=$1 TRAVIS_PHP_VERSION=$2 +NOTESTS=$3 + +if [ "$NOTESTS" == '1' ] +then + exit 0 +fi if [ "$DB" == "postgres" ] then @@ -20,7 +26,7 @@ then psql -c 'create database phpbb_tests;' -U postgres fi -if [ "$TRAVIS_PHP_VERSION" == "5.3" -a "$DB" == "mysqli" ] +if [ "$TRAVIS_PHP_VERSION" == "5.4" -a "$DB" == "mysqli" ] then mysql -e 'SET GLOBAL storage_engine=MyISAM;' fi diff --git a/travis/setup-phpbb.sh b/travis/setup-phpbb.sh index 369c477860..30f79ee0cb 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" -a "$DB" == "mysqli" ] +if [ "$NOTESTS" == '1' ] then travis/setup-exiftool.sh travis/setup-unbuffer.sh @@ -25,12 +26,12 @@ 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 |