From 09e81620a11d9f03691edae0e916d2493ec78843 Mon Sep 17 00:00:00 2001 From: Fabrice Lecomte Date: Wed, 24 Mar 2021 21:32:28 +0100 Subject: [PATCH 1/5] rollback lintCheck after test, create task testAll --- build.gradle.kts | 8 +++- .../component/article/ArticleViewManager.kt | 48 +++++++++---------- 2 files changed, 31 insertions(+), 25 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index a49c495..02bcdba 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -191,10 +191,16 @@ tasks.test { useJUnitPlatform() systemProperty("junit.jupiter.execution.parallel.enabled", true) dependsOn(testSql) - finalizedBy(tasks.ktlintCheck) finalizedBy(tasks.jacocoTestReport) // report is always generated after tests run } +tasks.register("testAll") { + group = "verification" + dependsOn(testSql) + dependsOn(tasks.test) + dependsOn(tasks.ktlintCheck) +} + apply(plugin = "docker-compose") dockerCompose { projectName = "dc-project" diff --git a/src/main/kotlin/fr/dcproject/component/article/ArticleViewManager.kt b/src/main/kotlin/fr/dcproject/component/article/ArticleViewManager.kt index 7150216..757a47a 100644 --- a/src/main/kotlin/fr/dcproject/component/article/ArticleViewManager.kt +++ b/src/main/kotlin/fr/dcproject/component/article/ArticleViewManager.kt @@ -59,33 +59,33 @@ class ArticleViewManager (private val restClient: RestClient) : ViewManager< //language=JSON setJsonEntity( """ - { - "size": 0, - "query": { - "bool": { - "must": { - "term": { - "version_id": "${entity.versionId}" + { + "size": 0, + "query": { + "bool": { + "must": { + "term": { + "version_id": "${entity.versionId}" + } + } + } + }, + "aggs" : { + "total": { + "composite" : { + "sources" : [ + { "version_id": { "terms": {"field": "version_id" } } } + ] + } + }, + "unique" : { + "cardinality" : { + "field" : "user_ref", + "precision_threshold": 1 + } } } } - }, - "aggs" : { - "total": { - "composite" : { - "sources" : [ - { "version_id": { "terms": {"field": "version_id" } } } - ] - } - }, - "unique" : { - "cardinality" : { - "field" : "user_ref", - "precision_threshold": 1 - } - } - } - } """.trimIndent() ) } -- 2.49.1 From b2f40ff421eabf34b688a6ab1631ca9c97047541 Mon Sep 17 00:00:00 2001 From: Fabrice Lecomte Date: Wed, 24 Mar 2021 21:56:58 +0100 Subject: [PATCH 2/5] Restrict CI on pull_request on master --- .github/workflows/tests.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 52c31a1..2c79952 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -4,12 +4,9 @@ name: Tests on: - push: - branches: - - '**' pull_request: branches: - - '**' + - 'master' jobs: build: -- 2.49.1 From 104f0fb3fcb118bbfb4f3b955b8b96bdf42aab8b Mon Sep 17 00:00:00 2001 From: Fabrice Lecomte Date: Wed, 24 Mar 2021 23:06:38 +0100 Subject: [PATCH 3/5] remove distZip & distTar --- build.gradle.kts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build.gradle.kts b/build.gradle.kts index 02bcdba..812ac92 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -60,6 +60,9 @@ buildscript { } } +tasks.distZip.configure { enabled = false } +tasks.distTar.configure { enabled = false } + tasks.withType { kotlinOptions { jvmTarget = "11" -- 2.49.1 From b13cd5544c0db371d76060545ff7b2ac682e28b7 Mon Sep 17 00:00:00 2001 From: Fabrice Lecomte Date: Thu, 25 Mar 2021 00:30:01 +0100 Subject: [PATCH 4/5] add coveralls on CI --- .github/workflows/tests.yml | 7 +++++++ README.md | 2 ++ build.gradle.kts | 5 +++++ 3 files changed, 14 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 2c79952..5281b1e 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -94,6 +94,13 @@ jobs: with: gradle-version: 6.8 arguments: test -x testSql + - name: Coverage + uses: eskatos/gradle-command-action@v1 + with: + gradle-version: 6.8 + arguments: coveralls + env: + COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }} lint: needs: build diff --git a/README.md b/README.md index 0031dba..6f02438 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,8 @@ [![CodeFactor](https://www.codefactor.io/repository/github/flecomte/dc-project/badge?s=869dc426625a253a07bea95f9380e23fdb048b94)](https://www.codefactor.io/repository/github/flecomte/dc-project) [![Tests](https://github.com/flecomte/dc-project/actions/workflows/tests.yml/badge.svg)](https://github.com/flecomte/dc-project/actions/workflows/tests.yml) +[![Coverage Status](https://coveralls.io/repos/github/flecomte/dc-project/badge.svg?branch=master)](https://coveralls.io/github/flecomte/dc-project?branch=master) + [Installation](./doc/installation/Installation.md) diff --git a/build.gradle.kts b/build.gradle.kts index 812ac92..cf30e10 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -41,6 +41,7 @@ plugins { id("net.nemerosa.versioning") version "2.14.0" id("io.gitlab.arturbosch.detekt") version "1.16.0-RC1" id("com.avast.gradle.docker-compose") version "0.14.0" + id("com.github.kt3k.coveralls") version "2.8.4" } application { @@ -197,6 +198,10 @@ tasks.test { finalizedBy(tasks.jacocoTestReport) // report is always generated after tests run } +coveralls { + sourceDirs.add("src/main/kotlin") +} + tasks.register("testAll") { group = "verification" dependsOn(testSql) -- 2.49.1 From 1be608e6b211be761732a8497640327f43e8a13d Mon Sep 17 00:00:00 2001 From: Fabrice Lecomte Date: Thu, 25 Mar 2021 02:05:05 +0100 Subject: [PATCH 5/5] Add Codacy badge --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 6f02438..73b7d46 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,7 @@ [![CodeFactor](https://www.codefactor.io/repository/github/flecomte/dc-project/badge?s=869dc426625a253a07bea95f9380e23fdb048b94)](https://www.codefactor.io/repository/github/flecomte/dc-project) [![Tests](https://github.com/flecomte/dc-project/actions/workflows/tests.yml/badge.svg)](https://github.com/flecomte/dc-project/actions/workflows/tests.yml) [![Coverage Status](https://coveralls.io/repos/github/flecomte/dc-project/badge.svg?branch=master)](https://coveralls.io/github/flecomte/dc-project?branch=master) +[![Codacy Badge](https://app.codacy.com/project/badge/Grade/0ec4fe63370148ca956974f90f8d55be)](https://www.codacy.com/gh/flecomte/dc-project/dashboard?utm_source=github.com&utm_medium=referral&utm_content=flecomte/dc-project&utm_campaign=Badge_Grade) [Installation](./doc/installation/Installation.md) -- 2.49.1