From f1e9670175047724bf23727ab17f807303281150 Mon Sep 17 00:00:00 2001 From: Josh Rosen Date: Fri, 4 Oct 2019 16:22:49 -0700 Subject: [PATCH] Re-enable coverage using Codecov instead of Coveralls --- README.md | 6 +++--- project/plugins.sbt | 2 +- scripts/run_test.sh | 7 +++++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index c1610cff7e..81a7b309bc 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Scalding [![Build status](https://img.shields.io/travis/twitter/scalding/develop.svg)](http://travis-ci.org/twitter/scalding) -[![Coverage Status](https://coveralls.io/repos/twitter/scalding/badge.png?branch=develop)](https://coveralls.io/r/twitter/scalding?branch=develop) +[![Coverage Status](https://img.shields.io/codecov/c/github/twitter/scalding/develop.svg?maxAge=3600)](https://codecov.io/github/twitter/scalding) [![Latest version](https://index.scala-lang.org/twitter/scalding/scalding-core/latest.svg?color=orange)](https://index.scala-lang.org/twitter/scalding/scalding-core) [![Chat](https://badges.gitter.im/twitter/scalding.svg)](https://gitter.im/twitter/scalding?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) @@ -92,8 +92,8 @@ Please refer to [FAQ page](https://github.com/twitter/scalding/wiki/Frequently-a We use [Travis CI](http://travis-ci.org/) to verify the build: [![Build Status](https://travis-ci.org/twitter/scalding.svg?branch=develop)](http://travis-ci.org/twitter/scalding) -We use [Coveralls](https://coveralls.io/r/twitter/scalding) for code coverage results: -[![Coverage Status](https://coveralls.io/repos/twitter/scalding/badge.png?branch=develop)](https://coveralls.io/r/twitter/scalding?branch=develop) +We use [Codecov](https://codecov.io/github/twitter/scalding) for code coverage results: +[![Coverage Status](https://img.shields.io/codecov/c/github/twitter/scalding/develop.svg?maxAge=3600)](https://codecov.io/github/twitter/scalding) Scalding modules are available from maven central. diff --git a/project/plugins.sbt b/project/plugins.sbt index 2294d9e17b..9e9bc74136 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -16,6 +16,6 @@ addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.14") addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.5.4") addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "0.6.2") addSbtPlugin("com.typesafe.sbt" % "sbt-scalariform" % "1.3.0") -addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.0") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.0") addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "1.0") addSbtPlugin("org.wartremover" % "sbt-wartremover" % "2.1.1") diff --git a/scripts/run_test.sh b/scripts/run_test.sh index a986828d4c..7d4c17bebb 100755 --- a/scripts/run_test.sh +++ b/scripts/run_test.sh @@ -28,8 +28,8 @@ kill -9 $PROGRESS_REPORTER_PID export JVM_OPTS="-XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:ReservedCodeCacheSize=128m -XX:+TieredCompilation -XX:MaxPermSize=256m -Xms256m -Xmx768m -Xss2m" echo "calling ... " -echo "time ./sbt ++$TRAVIS_SCALA_VERSION $(withCmd test)" -time ./sbt -Dhttp.keepAlive=false -Dsbt.repository.secure=false ++$TRAVIS_SCALA_VERSION "$(withCmd test)" +echo "time ./sbt ++$TRAVIS_SCALA_VERSION coverage $(withCmd test) coverageReport" +time ./sbt -Dhttp.keepAlive=false -Dsbt.repository.secure=false ++$TRAVIS_SCALA_VERSION coverage "$(withCmd test)" coverageReport TST_EXIT_CODE=$? echo "Running mima checks ... " @@ -44,5 +44,8 @@ COMPILE_DOC_EXIT_CODE=$? echo "all done" +time ./sbt -Dhttp.keepAlive=false -Dsbt.repository.secure=false ++$TRAVIS_SCALA_VERSION coverageAggregate +bash <(curl -s https://codecov.io/bash) + $BASE_DIR/scripts/packDeps.sh exit $(( $TST_EXIT_CODE || $MIMA_EXIT_CODE || $COMPILE_DOC_EXIT_CODE ))