diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-08-07 14:30:41 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-08-07 14:30:41 +0200 |
| commit | f01b602e9f735fc6f807aa542371a6c9a24b33d3 (patch) | |
| tree | 522d721e6eff369f588cc01d504473f12cb65746 | |
| parent | 122898d221262744e05b5f44ca99dcaccc28484f (diff) | |
| parent | b700e871cf62aa902047b1b49f639f3221ee1ca3 (diff) | |
| download | forums-f01b602e9f735fc6f807aa542371a6c9a24b33d3.tar forums-f01b602e9f735fc6f807aa542371a6c9a24b33d3.tar.gz forums-f01b602e9f735fc6f807aa542371a6c9a24b33d3.tar.bz2 forums-f01b602e9f735fc6f807aa542371a6c9a24b33d3.tar.xz forums-f01b602e9f735fc6f807aa542371a6c9a24b33d3.zip | |
Merge pull request #2808 from nickvergessen/ticket/12917
[ticket/12917] Check commit message and image ICC profile on 5.3.3
* nickvergessen/ticket/12917:
[ticket/12917] Check commit message and image ICC profile on 5.3.3
| -rw-r--r-- | .travis.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 0358500adc..330cce59b9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,12 +22,12 @@ before_script: - sh -c "if [ '$TRAVIS_PHP_VERSION' != '5.2' ]; then php ../composer.phar install --dev --no-interaction --prefer-source; fi" - cd .. - sh -c "if [ `php -r "echo (int) version_compare(PHP_VERSION, '5.3.19', '>=');"` = "1" ]; then travis/setup-webserver.sh; fi" - - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.5' -a '$DB' = 'mysql' ]; then sudo apt-get update; sudo apt-get install -y parallel libimage-exiftool-perl; fi" + - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.3.3' -a '$DB' = 'mysql' ]; then sudo apt-get update; sudo apt-get install -y parallel libimage-exiftool-perl; fi" script: - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.2' ]; then phpunit --configuration travis/phpunit-$DB-5-2-travis.xml; else phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml; fi" - - 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' = 'mysql' ]; then find . -type f -not -path './phpBB/vendor/*' -iregex '.*\.\(gif\|jpg\|jpeg\|png\)$' | parallel --gnu --keep-order 'phpBB/develop/strip_icc_profiles.sh {}' || exit 1; fi" + - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.3.3' -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.3.3' -a '$DB' = 'mysql' ]; then find . -type f -not -path './phpBB/vendor/*' -iregex '.*\.\(gif\|jpg\|jpeg\|png\)$' | parallel --gnu --keep-order 'phpBB/develop/strip_icc_profiles.sh {}' || exit 1; fi" matrix: include: |