From 0a6b8cff3fdda02b838b3083625fbb240bc0169b Mon Sep 17 00:00:00 2001 From: Karl Heinz Marbaise Date: Thu, 29 Dec 2022 23:01:34 +0100 Subject: [PATCH 1/5] WIP: First step. --- .github/workflows/pull.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.github/workflows/pull.yml b/.github/workflows/pull.yml index fa3ad3daba..748645804b 100644 --- a/.github/workflows/pull.yml +++ b/.github/workflows/pull.yml @@ -64,3 +64,16 @@ jobs: ${{ github.workspace }}/itf-examples/target/failsafe-reports/TEST-*.xml ${{ github.workspace }}/itf-failure-plugin/target/failsafe-reports/TEST-*.xml ${{ github.workspace }}/itf-maven-plugin/target/failsafe-reports/TEST-*.xml + + - name: "Add coverage to PR" + id: jacoco + uses: madrapps/jacoco-report@v1.3 + with: + paths: | + ${{ github.workspace }}/itf-assertj/target/site/jacoco/jacoco.xml + ${{ github.workspace }}/itf-examples/target/site/jacoco/jacoco.xml + ${{ github.workspace }}/itf-extension-maven/target/site/jacoco/jacoco.xml + ${{ github.workspace }}/itf-failure-maven/target/site/jacoco/jacoco.xml + ${{ github.workspace }}/itf-maven-plugin/target/site/jacoco/jacoco.xml + token: ${{ secrets.GITHUB_TOKEN }} + debug-mode: true From 3a1d29b677f70ee73a259858889f85250924469d Mon Sep 17 00:00:00 2001 From: Karl Heinz Marbaise Date: Thu, 29 Dec 2022 23:41:22 +0100 Subject: [PATCH 2/5] WIP: Second step. --- .github/workflows/pull.yml | 6 +++--- pom.xml | 15 +++++++++++++++ 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pull.yml b/.github/workflows/pull.yml index 748645804b..145ae6818b 100644 --- a/.github/workflows/pull.yml +++ b/.github/workflows/pull.yml @@ -71,9 +71,9 @@ jobs: with: paths: | ${{ github.workspace }}/itf-assertj/target/site/jacoco/jacoco.xml - ${{ github.workspace }}/itf-examples/target/site/jacoco/jacoco.xml + ${{ github.workspace }}/itf-examples/target/site/jacoco-it/jacoco.xml ${{ github.workspace }}/itf-extension-maven/target/site/jacoco/jacoco.xml - ${{ github.workspace }}/itf-failure-maven/target/site/jacoco/jacoco.xml - ${{ github.workspace }}/itf-maven-plugin/target/site/jacoco/jacoco.xml + ${{ github.workspace }}/itf-failure-maven/target/site/jacoco-it/jacoco.xml + ${{ github.workspace }}/itf-maven-plugin/target/site/jacoco-it/jacoco.xml token: ${{ secrets.GITHUB_TOKEN }} debug-mode: true diff --git a/pom.xml b/pom.xml index 00199cbe74..1049dac308 100644 --- a/pom.xml +++ b/pom.xml @@ -184,6 +184,21 @@ + + org.jacoco + jacoco-maven-plugin + + + + prepare-agent + prepare-agent-integration + report + report-integration + + + + + From 5bba059f374acbf49c38c287a8b1132f62e6edb7 Mon Sep 17 00:00:00 2001 From: Karl Heinz Marbaise Date: Fri, 30 Dec 2022 00:19:03 +0100 Subject: [PATCH 3/5] Next step. --- .github/workflows/pull.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pull.yml b/.github/workflows/pull.yml index 145ae6818b..7cf480687a 100644 --- a/.github/workflows/pull.yml +++ b/.github/workflows/pull.yml @@ -70,10 +70,10 @@ jobs: uses: madrapps/jacoco-report@v1.3 with: paths: | - ${{ github.workspace }}/itf-assertj/target/site/jacoco/jacoco.xml - ${{ github.workspace }}/itf-examples/target/site/jacoco-it/jacoco.xml - ${{ github.workspace }}/itf-extension-maven/target/site/jacoco/jacoco.xml - ${{ github.workspace }}/itf-failure-maven/target/site/jacoco-it/jacoco.xml + ${{ github.workspace }}/itf-assertj/target/site/jacoco/jacoco.xml, + ${{ github.workspace }}/itf-examples/target/site/jacoco-it/jacoco.xml, + ${{ github.workspace }}/itf-extension-maven/target/site/jacoco/jacoco.xml, + ${{ github.workspace }}/itf-failure-maven/target/site/jacoco-it/jacoco.xml, ${{ github.workspace }}/itf-maven-plugin/target/site/jacoco-it/jacoco.xml token: ${{ secrets.GITHUB_TOKEN }} debug-mode: true From 86f5796be01a966cd8a3ea27fd273b3b836f8014 Mon Sep 17 00:00:00 2001 From: Karl Heinz Marbaise Date: Fri, 30 Dec 2022 00:27:02 +0100 Subject: [PATCH 4/5] Fursth. --- .github/workflows/pull.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull.yml b/.github/workflows/pull.yml index 7cf480687a..b789387a61 100644 --- a/.github/workflows/pull.yml +++ b/.github/workflows/pull.yml @@ -73,7 +73,7 @@ jobs: ${{ github.workspace }}/itf-assertj/target/site/jacoco/jacoco.xml, ${{ github.workspace }}/itf-examples/target/site/jacoco-it/jacoco.xml, ${{ github.workspace }}/itf-extension-maven/target/site/jacoco/jacoco.xml, - ${{ github.workspace }}/itf-failure-maven/target/site/jacoco-it/jacoco.xml, + ${{ github.workspace }}/itf-failure-plugin/target/site/jacoco-it/jacoco.xml, ${{ github.workspace }}/itf-maven-plugin/target/site/jacoco-it/jacoco.xml token: ${{ secrets.GITHUB_TOKEN }} debug-mode: true From 24b8adced9cc5b312b969485bf10c12a87854816 Mon Sep 17 00:00:00 2001 From: Karl Heinz Marbaise Date: Fri, 30 Dec 2022 00:59:01 +0100 Subject: [PATCH 5/5] Fixed paths. --- .github/workflows/pull.yml | 2 ++ itf-examples/pom.xml | 3 +++ 2 files changed, 5 insertions(+) diff --git a/.github/workflows/pull.yml b/.github/workflows/pull.yml index b789387a61..fbf523f514 100644 --- a/.github/workflows/pull.yml +++ b/.github/workflows/pull.yml @@ -71,9 +71,11 @@ jobs: with: paths: | ${{ github.workspace }}/itf-assertj/target/site/jacoco/jacoco.xml, + ${{ github.workspace }}/itf-examples/target/site/jacoco/jacoco.xml, ${{ github.workspace }}/itf-examples/target/site/jacoco-it/jacoco.xml, ${{ github.workspace }}/itf-extension-maven/target/site/jacoco/jacoco.xml, ${{ github.workspace }}/itf-failure-plugin/target/site/jacoco-it/jacoco.xml, + ${{ github.workspace }}/itf-jupiter-extension/target/site/jacoco/jacoco.xml, ${{ github.workspace }}/itf-maven-plugin/target/site/jacoco-it/jacoco.xml token: ${{ secrets.GITHUB_TOKEN }} debug-mode: true diff --git a/itf-examples/pom.xml b/itf-examples/pom.xml index 08911fb4b0..817faa7b1a 100644 --- a/itf-examples/pom.xml +++ b/itf-examples/pom.xml @@ -144,6 +144,9 @@ junit.jupiter.execution.parallel.config.fixed.parallelism=6 + + LogoutputIT +