From b8fb9da587203475a98873289b90036da6d54f54 Mon Sep 17 00:00:00 2001 From: Aaron Coburn Date: Mon, 18 Dec 2017 08:59:46 -0500 Subject: [PATCH 1/5] Enable coveralls --- .travis.yml | 2 +- build.gradle | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3823cd250..55215544e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,4 +27,4 @@ matrix: - env: JDK_RELEASE='JDK 10 Early-Access' after_success: - - ./gradlew jacocoRootReport sonarqube + - ./gradlew jacocoRootReport coveralls sonarqube diff --git a/build.gradle b/build.gradle index 93cb18419..1fbfb7a3b 100644 --- a/build.gradle +++ b/build.gradle @@ -2,6 +2,7 @@ plugins { id 'com.github.hierynomus.license' version '0.14.0' id 'com.github.ben-manes.versions' version '0.17.0' id 'net.researchgate.release' version '2.6.0' + id 'com.github.kt3k.coveralls' version '2.8.2' id 'org.sonarqube' version '2.6.1' } @@ -280,6 +281,7 @@ sonarqube { } } + task jacocoRootReport(type: org.gradle.testing.jacoco.tasks.JacocoReport) { dependsOn = subprojects.test additionalSourceDirs = files(subprojects.sourceSets.main.allSource.srcDirs) @@ -293,5 +295,16 @@ task jacocoRootReport(type: org.gradle.testing.jacoco.tasks.JacocoReport) { } } -check.dependsOn processBuildTools +coveralls { + sourceDirs = subprojects.sourceSets.main.allSource.srcDirs.flatten() + jacocoReportPath = "${buildDir}/reports/jacoco/jacocoRootReport/jacocoRootReport.xml" +} +task.coveralls { + dependsOn check + onlyIf { + System.env.'CI' && !JavaVersion.current().isJava9Compatible() + } +} + +check.dependsOn processBuildTools From d5d058d8ccd88d5791db8acb77262d14bc6f4125 Mon Sep 17 00:00:00 2001 From: Aaron Coburn Date: Mon, 18 Dec 2017 09:08:20 -0500 Subject: [PATCH 2/5] Add coveralls configuration --- build.gradle | 7 ------- 1 file changed, 7 deletions(-) diff --git a/build.gradle b/build.gradle index 1fbfb7a3b..945a0d827 100644 --- a/build.gradle +++ b/build.gradle @@ -300,11 +300,4 @@ coveralls { jacocoReportPath = "${buildDir}/reports/jacoco/jacocoRootReport/jacocoRootReport.xml" } -task.coveralls { - dependsOn check - onlyIf { - System.env.'CI' && !JavaVersion.current().isJava9Compatible() - } -} - check.dependsOn processBuildTools From 3fbcec3ee25aa01fd2c2deb07e18198ce2b93b91 Mon Sep 17 00:00:00 2001 From: Aaron Coburn Date: Mon, 18 Dec 2017 09:30:02 -0500 Subject: [PATCH 3/5] Update coveralls configuration --- build.gradle | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build.gradle b/build.gradle index 945a0d827..cb7ca0121 100644 --- a/build.gradle +++ b/build.gradle @@ -300,4 +300,8 @@ coveralls { jacocoReportPath = "${buildDir}/reports/jacoco/jacocoRootReport/jacocoRootReport.xml" } +tasks.coveralls { + dependsOn 'check' +} + check.dependsOn processBuildTools From ab4a98fbb2b41bcbfa0dc27ff41e973223046900 Mon Sep 17 00:00:00 2001 From: Aaron Coburn Date: Mon, 18 Dec 2017 09:35:41 -0500 Subject: [PATCH 4/5] Change coveralls dependency order --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index cb7ca0121..e5c2e3b0b 100644 --- a/build.gradle +++ b/build.gradle @@ -301,7 +301,7 @@ coveralls { } tasks.coveralls { - dependsOn 'check' + dependsOn 'jacocoRootReport' } check.dependsOn processBuildTools From 68c1e0a1217986a77ce655db26a3a1c0c68d4f83 Mon Sep 17 00:00:00 2001 From: Aaron Coburn Date: Mon, 18 Dec 2017 09:42:51 -0500 Subject: [PATCH 5/5] Add coverage badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d89d248cf..da9309678 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ A scalable platform for building [linked data](https://www.w3.org/TR/ldp/) appli [![Build Status](https://travis-ci.org/trellis-ldp/trellis.png?branch=master)](https://travis-ci.org/trellis-ldp/trellis) [![Build status](https://ci.appveyor.com/api/projects/status/nvdwx442663ib39d?svg=true)](https://ci.appveyor.com/project/acoburn/trellis) -[![Coverage Status](https://sonarcloud.io/api/badges/measure?key=org.trellisldp%3Atrellis&metric=coverage)](https://sonarcloud.io/dashboard?id=org.trellisldp%3Atrellis) +[![Coverage Status](https://coveralls.io/repos/github/trellis-ldp/trellis/badge.svg?branch=master)](https://coveralls.io/github/trellis-ldp/trellis?branch=master) ## Mailing list