mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-09-03 05:12:37 +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.yml
View File

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