Skip to content

Commit 954472c

Browse files
committed
Merge branch 'dopesong-coveralls' into 3.x
Closes slimphp#1865
2 parents 0141e08 + dc4995a commit 954472c

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

.coveralls.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
service_name: travis-ci
2-
src_dir: Slim
1+
json_path: coveralls-upload.json

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ php:
99
- hhvm
1010

1111
before_script:
12-
- if [[ "$TRAVIS_PHP_VERSION" == '5.6' ]]; then composer require satooshi/php-coveralls:dev-master squizlabs/php_codesniffer:2.* -n ; fi
12+
- if [[ "$TRAVIS_PHP_VERSION" == '5.6' ]]; then composer require satooshi/php-coveralls:1.* squizlabs/php_codesniffer:2.* -n ; fi
1313
- if [[ "$TRAVIS_PHP_VERSION" != '5.6' ]]; then composer install -n ; fi
1414

1515
script:
16-
- if [[ "$TRAVIS_PHP_VERSION" == '5.6' ]]; then mkdir -p build/logs && phpunit --coverage-clover build/logs/clover.xml ; fi
16+
- if [[ "$TRAVIS_PHP_VERSION" == '5.6' ]]; then phpunit --coverage-clover clover.xml ; fi
1717
- if [[ "$TRAVIS_PHP_VERSION" != '5.6' ]]; then phpunit ; fi
1818
- if [[ "$TRAVIS_PHP_VERSION" == '5.6' ]]; then vendor/bin/phpcs ; fi
1919

2020
after_script:
21-
- if [[ "$TRAVIS_PHP_VERSION" == '5.6' ]]; then php vendor/bin/coveralls -v ; fi
21+
- if [[ "$TRAVIS_PHP_VERSION" == '5.6' ]]; then php vendor/bin/coveralls --coverage_clover=clover.xml -v ; fi

0 commit comments

Comments
 (0)