From 1ad87b46d5eeae2db7d8d18c50e27f8bc370651f Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 18 Jan 2015 16:40:37 +0100 Subject: [PATCH] [ticket/431] Rename scripts for coverage and remove .coveralls.yml B3P-431 --- .coveralls.yml | 5 ----- .travis.yml | 7 +++---- travis/{run-coveralls.sh => send-coverage.sh} | 0 3 files changed, 3 insertions(+), 9 deletions(-) delete mode 100644 .coveralls.yml rename travis/{run-coveralls.sh => send-coverage.sh} (100%) diff --git a/.coveralls.yml b/.coveralls.yml deleted file mode 100644 index f3443926..00000000 --- a/.coveralls.yml +++ /dev/null @@ -1,5 +0,0 @@ -#.coveralls.yml - -src_dir: ../../phpBB3 -coverage_clover: ../../phpBB3/build/logs/clover.xml -json_path: ../../phpBB3/build/logs/coveralls-upload.json diff --git a/.travis.yml b/.travis.yml index e0c73026..3ff068bf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,7 +31,7 @@ env: - EXTNAME="board3/portal" - SNIFF="1" # Should we run code sniffer on your code? - IMAGE_ICC="0" # Should we run icc profile sniffer on your images? - - COVERALLS="1" # Should we run coveralls? + - COVERAGE="1" # Should we send coverage? - EPV="1" # Should we run EPV (Extension Pre Validator) on your code? - SPELLCHECK="1" # Should the php files be checked for obvious spelling errors? - PHPBB_BRANCH="develop-ascraeus" @@ -44,11 +44,10 @@ branches: install: - php composer.phar install --dev --no-interaction --prefer-source - travis/prepare-phpbb.sh $EXTNAME $PHPBB_BRANCH - - cp .coveralls.yml ../../phpBB3/phpBB/.coveralls.yml - cd ../../phpBB3 - travis/prepare-extension.sh $EXTNAME $PHPBB_BRANCH - travis/setup-phpbb.sh $DB $TRAVIS_PHP_VERSION - - sh -c "if [ '$COVERALLS' != '0' ]; then ../board3/Board3-Portal/travis/prepare-coverage.sh $DB $TRAVIS_PHP_VERSION; fi" + - sh -c "if [ '$COVERAGE' != '0' ]; then ../board3/Board3-Portal/travis/prepare-coverage.sh $DB $TRAVIS_PHP_VERSION; fi" before_script: - travis/setup-database.sh $DB $TRAVIS_PHP_VERSION @@ -62,7 +61,7 @@ script: - sh -c "if [ '$EPV' != '0' ]; then ../board3/Board3-Portal/travis/run-epv.sh $DB $TRAVIS_PHP_VERSION $EXTNAME; fi" after_script: - - sh -c "if [ '$COVERALLS' != '0' ]; then ../board3/Board3-Portal/travis/run-coveralls.sh $DB $TRAVIS_PHP_VERSION; fi" + - sh -c "if [ '$COVERAGE' != '0' ]; then ../board3/Board3-Portal/travis/send-coverage.sh $DB $TRAVIS_PHP_VERSION; fi" notifications: email: diff --git a/travis/run-coveralls.sh b/travis/send-coverage.sh similarity index 100% rename from travis/run-coveralls.sh rename to travis/send-coverage.sh