From 8699cf6d07b5eafb9f51331852d30638ab3db2db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivan=20=E2=80=9CCLOVIS=E2=80=9D=20Canet?= Date: Tue, 19 Mar 2024 21:18:14 +0100 Subject: [PATCH 1/3] upgrade: OpenSavvy Gradle Conventions 1.2.0 See https://gitlab.com/opensavvy/automation/gradle-conventions/-/releases/1.2.0 --- gradle/conventions/settings.gradle.kts | 2 +- settings.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/conventions/settings.gradle.kts b/gradle/conventions/settings.gradle.kts index ba94ef2..f546984 100644 --- a/gradle/conventions/settings.gradle.kts +++ b/gradle/conventions/settings.gradle.kts @@ -43,7 +43,7 @@ pluginManagement { } plugins { - id("dev.opensavvy.conventions.settings") version "1.1.2" + id("dev.opensavvy.conventions.settings") version "1.2.0" } enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") diff --git a/settings.gradle.kts b/settings.gradle.kts index ba79ee2..48dac6b 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -47,7 +47,7 @@ pluginManagement { } plugins { - id("dev.opensavvy.conventions.settings") version "1.1.2" + id("dev.opensavvy.conventions.settings") version "1.2.0" } include( -- 2.51.2 From b480d99e225c57c5b61f8a38baa446c8bfcb91ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivan=20=E2=80=9CCLOVIS=E2=80=9D=20Canet?= Date: Tue, 19 Mar 2024 21:48:52 +0100 Subject: [PATCH 2/3] ci(gitlab): Measure and report code coverage for JVM tests --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ec26f10..5aa1be8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -63,12 +63,14 @@ check[jvm]: script: - > ./gradlew check + :koverLog -x jsBrowserTest -x jsNodeTest -x linuxX64Test -x iosSimulatorArm64Test -PappVersion=$project_version + coverage: '/application line coverage: (\d+\.?\d*%)/' interruptible: true check[jsBrowser]: -- 2.51.2 From fd370641ee588e4d419bfae1c7610d7758cdeafa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivan=20=E2=80=9CCLOVIS=E2=80=9D=20Canet?= Date: Tue, 19 Mar 2024 22:25:33 +0100 Subject: [PATCH 3/3] ci(gitlab): Expose the coverage report as an artifact --- .gitlab-ci.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5aa1be8..40dc074 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -64,13 +64,22 @@ check[jvm]: - > ./gradlew check :koverLog + :koverHtmlReport -x jsBrowserTest -x jsNodeTest -x linuxX64Test -x iosSimulatorArm64Test -PappVersion=$project_version + after_script: + - mkdir -p jvm-cover-report + - mv build/reports/kover/html/* jvm-cover-report + coverage: '/application line coverage: (\d+\.?\d*%)/' + artifacts: + paths: + - jvm-cover-report + expose_as: JVM code coverage interruptible: true check[jsBrowser]: -- 2.51.2