Merge branch '1.0' into 2.0

* 1.0:
  Scrutinizer CI: Unconfigure external code coverage. This keeps timing out.
This commit is contained in:
Andreas Fischer 2015-07-06 23:44:33 +02:00
commit 4114e06b1b
3 changed files with 0 additions and 21 deletions

View File

@ -1,7 +0,0 @@
imports:
- php
tools:
external_code_coverage:
runs: 5 # No Code Coverage and HHVM
timeout: 10800 # 3 hours

View File

@ -31,4 +31,3 @@ script:
after_success: after_success:
- sh -c "if $TRAVIS_SECURE_ENV_VARS; then travis/upload-code-coverage-html.sh; fi" - sh -c "if $TRAVIS_SECURE_ENV_VARS; then travis/upload-code-coverage-html.sh; fi"
- sh -c "if [ '$TRAVIS_PHP_VERSION' != 'hhvm' ]; then travis/upload-code-coverage-scrutinizer.sh; fi"

View File

@ -1,13 +0,0 @@
#!/bin/sh
#
# This file is part of the phpseclib project.
#
# (c) Andreas Fischer <bantu@phpbb.com>
#
# For the full copyright and license information, please view the LICENSE
# file that was distributed with this source code.
#
set -e
wget https://scrutinizer-ci.com/ocular.phar
php ocular.phar code-coverage:upload --format=php-clover code_coverage/clover.xml