diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-08-07 13:43:13 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-08-07 13:43:13 +0200 |
| commit | 7cde9a8ec0a20a384241167bea64da99d08a9d56 (patch) | |
| tree | fe6018854198a1f205673abfa1f30ff328ac9477 | |
| parent | f474e33a430176fd7ef809141b258eec77993e03 (diff) | |
| parent | b700e871cf62aa902047b1b49f639f3221ee1ca3 (diff) | |
| download | forums-7cde9a8ec0a20a384241167bea64da99d08a9d56.tar forums-7cde9a8ec0a20a384241167bea64da99d08a9d56.tar.gz forums-7cde9a8ec0a20a384241167bea64da99d08a9d56.tar.bz2 forums-7cde9a8ec0a20a384241167bea64da99d08a9d56.tar.xz forums-7cde9a8ec0a20a384241167bea64da99d08a9d56.zip | |
Merge branch 'ticket/12917' into ticket/12917-asc
* ticket/12917:
[ticket/12917] Check commit message and image ICC profile on 5.3.3
Conflicts:
.travis.yml
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rwxr-xr-x | travis/check-image-icc-profiles.sh | 2 | ||||
| -rwxr-xr-x | travis/setup-phpbb.sh | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index fe91fe78c8..aea2b8ed0a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,5 +39,5 @@ script: - travis/phing-sniff.sh $DB $TRAVIS_PHP_VERSION - travis/check-image-icc-profiles.sh $DB $TRAVIS_PHP_VERSION - phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml - - 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" + - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.3.3' -a '$DB' = 'mysqli' -a '$TRAVIS_PULL_REQUEST' != 'false' ]; then git-tools/commit-msg-hook-range.sh origin/$TRAVIS_BRANCH..FETCH_HEAD; fi" diff --git a/travis/check-image-icc-profiles.sh b/travis/check-image-icc-profiles.sh index 31848dc9e7..bb070ccc27 100755 --- a/travis/check-image-icc-profiles.sh +++ b/travis/check-image-icc-profiles.sh @@ -13,7 +13,7 @@ set -e DB=$1 TRAVIS_PHP_VERSION=$2 -if [ "$TRAVIS_PHP_VERSION" == "5.5" -a "$DB" == "mysqli" ] +if [ "$TRAVIS_PHP_VERSION" == "5.3.3" -a "$DB" == "mysqli" ] then find . -type f -not -path './phpBB/vendor/*' -iregex '.*\.\(gif\|jpg\|jpeg\|png\)$' | \ parallel --gnu --keep-order 'phpBB/develop/strip_icc_profiles.sh {}' diff --git a/travis/setup-phpbb.sh b/travis/setup-phpbb.sh index e2cf6eeda2..f065faf8e2 100755 --- a/travis/setup-phpbb.sh +++ b/travis/setup-phpbb.sh @@ -14,7 +14,7 @@ set -x DB=$1 TRAVIS_PHP_VERSION=$2 -if [ "$TRAVIS_PHP_VERSION" == "5.5" -a "$DB" == "mysqli" ] +if [ "$TRAVIS_PHP_VERSION" == "5.3.3" -a "$DB" == "mysqli" ] then travis/setup-exiftool.sh fi |