mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-05 00:07:44 +02:00
Code Issues Releases Wiki Activity

Merge branch 'ticket/12917' into ticket/12917-asc

Browse Source 
* ticket/12917:
  [ticket/12917] Check commit message and image ICC profile on 5.3.3

Conflicts:
	.travis.yml
This commit is contained in:
Joas Schilling
2014-08-07 13:43:13 +02:00
parent f474e33a43 b700e871cf
commit 7cde9a8ec0
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
travis/check-image-icc-profiles.sh
View File

@@ -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 {}'

2
travis/setup-phpbb.sh
View File

@@ -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