diff --git a/.circleci/config.yml b/.circleci/config.yml index 120b86e8f..69129619f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -68,7 +68,7 @@ jobs: - run: name: build, test, push docker command: | - ./gradlew assemble test jacocoMergedReport sonarqube \ + ./gradlew assemble test jacocoMergedReport sonar \ -Dsonar.login=${SONAR_TOKEN} -Dsonar.organization=molgenis -Dsonar.host.url=https://sonarcloud.io \ -Dorg.ajoberstar.grgit.auth.username=${GITHUB_TOKEN} -Dorg.ajoberstar.grgit.auth.password diff --git a/build.gradle b/build.gradle index 880130b1f..c5dcf6ecc 100644 --- a/build.gradle +++ b/build.gradle @@ -102,8 +102,12 @@ dockerPrepare.dependsOn test //merge test reports task jacocoMergedReport(type: JacocoReport) { - dependsOn project.getTasksByName("test", true) + dependsOn project.getTasksByName(":armadillo:test", true) + dependsOn project.getTasksByName(":r:test", true) dependsOn project.getTasksByName("jacocoTestReport", true) + dependsOn project.getTasksByName("jacocoTestReport", true) + dependsOn project.getTasksByName("bootStartScripts", true) + dependsOn project.getTasksByName("startScripts", true) additionalSourceDirs.setFrom files(subprojects.sourceSets.main.allSource.srcDirs) sourceDirectories.setFrom files(subprojects.sourceSets.main.allSource.srcDirs) classDirectories.setFrom files(subprojects.sourceSets.main.output)