diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-05-02 16:32:00 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-05-03 10:43:38 +0200 |
| commit | acf95247108c456b14bb95483a449f2ee7bd72b9 (patch) | |
| tree | bbe2cdd95b6ff0427d1f4060e8f4da6554797476 | |
| parent | 3b823465db93cf525249d00a412d5417b3216b83 (diff) | |
| download | forums-acf95247108c456b14bb95483a449f2ee7bd72b9.tar forums-acf95247108c456b14bb95483a449f2ee7bd72b9.tar.gz forums-acf95247108c456b14bb95483a449f2ee7bd72b9.tar.bz2 forums-acf95247108c456b14bb95483a449f2ee7bd72b9.tar.xz forums-acf95247108c456b14bb95483a449f2ee7bd72b9.zip | |
[ticket/12470] Move phing sniff into new .sh
PHPBB3-12470
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rwxr-xr-x | travis/phing-sniff.sh | 17 |
2 files changed, 18 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index f1d194add7..d8d931ae12 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,9 +28,7 @@ before_script: - sh -c "if [ '$DB' = 'mysql' -o '$DB' = 'mariadb' ]; then mysql -e 'create database IF NOT EXISTS phpbb_tests;'; fi" script: - - cd build - - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.5' -a '$DB' = 'mysql' ]; then ../phpBB/vendor/bin/phing sniff; fi" - - cd .. + - travis/phing-code-sniff.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' = 'mysql' -a '$TRAVIS_PULL_REQUEST' != 'false' ]; then git-tools/commit-msg-hook-range.sh origin/$TRAVIS_BRANCH..FETCH_HEAD; fi" diff --git a/travis/phing-sniff.sh b/travis/phing-sniff.sh new file mode 100755 index 0000000000..1473b99da4 --- /dev/null +++ b/travis/phing-sniff.sh @@ -0,0 +1,17 @@ +#!/bin/bash +# +# @copyright (c) 2014 phpBB Group +# @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +# +set -e +set -x + +DB=$1 +TRAVIS_PHP_VERSION=$2 + +if [ "$TRAVIS_PHP_VERSION" == "5.5" -a "$DB" == "mysql" ] +then + cd build + ../phpBB/vendor/bin/phing sniff + cd .. +fi |