From 08366f0a8ccfe7c13b5bd9f9ad3a4f912c910ffa Mon Sep 17 00:00:00 2001 From: mswertz Date: Mon, 24 Jul 2023 12:29:14 +0200 Subject: [PATCH 1/5] build: fix sonar --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index 880130b1f..de2128694 100644 --- a/build.gradle +++ b/build.gradle @@ -104,6 +104,7 @@ dockerPrepare.dependsOn test task jacocoMergedReport(type: JacocoReport) { dependsOn project.getTasksByName("test", true) dependsOn project.getTasksByName("jacocoTestReport", true) + dependsOn project.getTasksByName("bootStartScripts", true) additionalSourceDirs.setFrom files(subprojects.sourceSets.main.allSource.srcDirs) sourceDirectories.setFrom files(subprojects.sourceSets.main.allSource.srcDirs) classDirectories.setFrom files(subprojects.sourceSets.main.output) From 80e984e540abb810e6fb982bbd16f39c72902c89 Mon Sep 17 00:00:00 2001 From: mswertz Date: Mon, 24 Jul 2023 12:37:20 +0200 Subject: [PATCH 2/5] add more dependencies --- .circleci/config.yml | 2 +- build.gradle | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) 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 de2128694..3a9b2fca5 100644 --- a/build.gradle +++ b/build.gradle @@ -102,9 +102,11 @@ dockerPrepare.dependsOn test //merge test reports task jacocoMergedReport(type: JacocoReport) { + dependsOn project.getTasksByName("test", 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) From c9eda85067ae15c1dc3b436668f145a059d12c00 Mon Sep 17 00:00:00 2001 From: mswertz Date: Mon, 24 Jul 2023 13:03:38 +0200 Subject: [PATCH 3/5] add more dependencies --- build.gradle | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 3a9b2fca5..6c0d6e382 100644 --- a/build.gradle +++ b/build.gradle @@ -102,8 +102,7 @@ dockerPrepare.dependsOn test //merge test reports task jacocoMergedReport(type: JacocoReport) { - - dependsOn project.getTasksByName("test", true) + dependsOn subprojects.test dependsOn project.getTasksByName("jacocoTestReport", true) dependsOn project.getTasksByName("bootStartScripts", true) dependsOn project.getTasksByName("startScripts", true) From c656cf49c7502d266c335ea2e0aa55724c1e6e09 Mon Sep 17 00:00:00 2001 From: mswertz Date: Mon, 24 Jul 2023 13:04:00 +0200 Subject: [PATCH 4/5] add more dependencies --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 6c0d6e382..2a161fbe1 100644 --- a/build.gradle +++ b/build.gradle @@ -102,7 +102,7 @@ dockerPrepare.dependsOn test //merge test reports task jacocoMergedReport(type: JacocoReport) { - dependsOn subprojects.test + dependsOn = subprojects.test dependsOn project.getTasksByName("jacocoTestReport", true) dependsOn project.getTasksByName("bootStartScripts", true) dependsOn project.getTasksByName("startScripts", true) From e5d92eb69192fe260ec0966463fb0a1aaa46e080 Mon Sep 17 00:00:00 2001 From: mswertz Date: Mon, 24 Jul 2023 13:04:42 +0200 Subject: [PATCH 5/5] add more dependencies --- build.gradle | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 2a161fbe1..c5dcf6ecc 100644 --- a/build.gradle +++ b/build.gradle @@ -102,7 +102,9 @@ dockerPrepare.dependsOn test //merge test reports task jacocoMergedReport(type: JacocoReport) { - dependsOn = subprojects.test + 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)