From 99837b27a2297181abe867a60cf6d64cb672edab Mon Sep 17 00:00:00 2001 From: miroslavpojer Date: Fri, 21 Mar 2025 15:49:24 +0100 Subject: [PATCH 01/15] - Updated workflow file. - Fake change to see result. --- .github/workflows/check-jacoco.yml | 36 ++++++++++++++----- .../absa/commons/buildinfo/PropMapping.scala | 1 + 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/.github/workflows/check-jacoco.yml b/.github/workflows/check-jacoco.yml index 2b3e95c..444c2cd 100644 --- a/.github/workflows/check-jacoco.yml +++ b/.github/workflows/check-jacoco.yml @@ -31,23 +31,41 @@ jobs: scala: [ 2.11, 2.12 ] steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Setup Scala uses: olafurpg/setup-scala@v10 with: java-version: "adopt@1.8" - name: Build and run tests run: mvn clean verify -Pcode-coverage,scala-${{ matrix.scala }} --no-transfer-progress - - name: Add coverage to PR + + - uses: kishaningithub/setup-python-amazon-linux@v1 + with: + python-version: '3.12' + + - name: Add JaCoCo Report in PR comments id: jacoco - uses: madrapps/jacoco-report@v1.3 + uses: MoranaApps/jacoco-report@feature/4-Integrate-with-1st-project with: - paths: ${{ github.workspace }}/target/site/jacoco/jacoco.xml - token: ${{ secrets.GITHUB_TOKEN }} - min-coverage-overall: 0.0 - min-coverage-changed-files: 80.0 - title: JaCoCo code coverage report - Scala ${{ matrix.scala }} - update-comment: true + token: '${{ secrets.GITHUB_TOKEN }}' + paths: | + **/target/site/jacoco/jacoco.xml + sensitivity: "detail" + comment-mode: 'single' + debug: 'true' + +# - name: Add coverage to PR +# id: jacoco +# uses: madrapps/jacoco-report@v1.3 +# with: +# paths: ${{ github.workspace }}/target/site/jacoco/jacoco.xml +# token: ${{ secrets.GITHUB_TOKEN }} +# min-coverage-overall: 0.0 +# min-coverage-changed-files: 80.0 +# title: JaCoCo code coverage report - Scala ${{ matrix.scala }} +# update-comment: true + + - name: Get the Coverage info run: | echo "Total coverage ${{ steps.jacoco.outputs.coverage-overall }}" diff --git a/src/main/scala/za/co/absa/commons/buildinfo/PropMapping.scala b/src/main/scala/za/co/absa/commons/buildinfo/PropMapping.scala index 4f0f777..e741b03 100644 --- a/src/main/scala/za/co/absa/commons/buildinfo/PropMapping.scala +++ b/src/main/scala/za/co/absa/commons/buildinfo/PropMapping.scala @@ -26,4 +26,5 @@ case class PropMapping( object PropMapping { final val Default: PropMapping = PropMapping() + } From 74dc193b3c9d6a76ba4878219251d46900d7c2de Mon Sep 17 00:00:00 2001 From: miroslavpojer Date: Fri, 21 Mar 2025 15:56:33 +0100 Subject: [PATCH 02/15] - Fix. --- .github/workflows/check-jacoco.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-jacoco.yml b/.github/workflows/check-jacoco.yml index 444c2cd..569fde7 100644 --- a/.github/workflows/check-jacoco.yml +++ b/.github/workflows/check-jacoco.yml @@ -39,7 +39,7 @@ jobs: - name: Build and run tests run: mvn clean verify -Pcode-coverage,scala-${{ matrix.scala }} --no-transfer-progress - - uses: kishaningithub/setup-python-amazon-linux@v1 + - uses: actions/setup-python@v5 with: python-version: '3.12' From 49f92be2261baf5be423111832b52f6fbb723402 Mon Sep 17 00:00:00 2001 From: miroslavpojer Date: Fri, 21 Mar 2025 16:06:46 +0100 Subject: [PATCH 03/15] - Testing. --- .github/workflows/check-jacoco.yml | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/.github/workflows/check-jacoco.yml b/.github/workflows/check-jacoco.yml index 569fde7..ef0d4de 100644 --- a/.github/workflows/check-jacoco.yml +++ b/.github/workflows/check-jacoco.yml @@ -54,17 +54,16 @@ jobs: comment-mode: 'single' debug: 'true' -# - name: Add coverage to PR -# id: jacoco -# uses: madrapps/jacoco-report@v1.3 -# with: -# paths: ${{ github.workspace }}/target/site/jacoco/jacoco.xml -# token: ${{ secrets.GITHUB_TOKEN }} -# min-coverage-overall: 0.0 -# min-coverage-changed-files: 80.0 -# title: JaCoCo code coverage report - Scala ${{ matrix.scala }} -# update-comment: true - + - name: Add coverage to PR + id: jacoco + uses: madrapps/jacoco-report@v1.3 + with: + paths: ${{ github.workspace }}/target/site/jacoco/jacoco.xml + token: ${{ secrets.GITHUB_TOKEN }} + min-coverage-overall: 0.0 + min-coverage-changed-files: 80.0 + title: JaCoCo code coverage report - Scala ${{ matrix.scala }} + update-comment: true - name: Get the Coverage info run: | From fe3320962694792f5425a01944ff216e74e6cef4 Mon Sep 17 00:00:00 2001 From: miroslavpojer Date: Fri, 21 Mar 2025 16:09:54 +0100 Subject: [PATCH 04/15] - Testing. --- .github/workflows/check-jacoco.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-jacoco.yml b/.github/workflows/check-jacoco.yml index ef0d4de..a5d598d 100644 --- a/.github/workflows/check-jacoco.yml +++ b/.github/workflows/check-jacoco.yml @@ -55,7 +55,7 @@ jobs: debug: 'true' - name: Add coverage to PR - id: jacoco + id: jacoco-old uses: madrapps/jacoco-report@v1.3 with: paths: ${{ github.workspace }}/target/site/jacoco/jacoco.xml From 406ba53643f50887f15ef359c32a76a821cf06fd Mon Sep 17 00:00:00 2001 From: miroslavpojer Date: Fri, 21 Mar 2025 16:12:54 +0100 Subject: [PATCH 05/15] - Testing. --- .github/workflows/check-jacoco.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-jacoco.yml b/.github/workflows/check-jacoco.yml index a5d598d..abdf6ed 100644 --- a/.github/workflows/check-jacoco.yml +++ b/.github/workflows/check-jacoco.yml @@ -62,7 +62,7 @@ jobs: token: ${{ secrets.GITHUB_TOKEN }} min-coverage-overall: 0.0 min-coverage-changed-files: 80.0 - title: JaCoCo code coverage report - Scala ${{ matrix.scala }} + title: Old JaCoCo code coverage report - Scala ${{ matrix.scala }} update-comment: true - name: Get the Coverage info From 33914ff553be9f794784352f2527bd5e0299a16e Mon Sep 17 00:00:00 2001 From: miroslavpojer Date: Fri, 21 Mar 2025 18:59:14 +0100 Subject: [PATCH 06/15] - Testing. --- .github/workflows/check-jacoco.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/check-jacoco.yml b/.github/workflows/check-jacoco.yml index abdf6ed..57454c7 100644 --- a/.github/workflows/check-jacoco.yml +++ b/.github/workflows/check-jacoco.yml @@ -65,6 +65,7 @@ jobs: title: Old JaCoCo code coverage report - Scala ${{ matrix.scala }} update-comment: true + - name: Get the Coverage info run: | echo "Total coverage ${{ steps.jacoco.outputs.coverage-overall }}" From 6a33da67e4642eaec2addd7eb2998ca31fbc722c Mon Sep 17 00:00:00 2001 From: miroslavpojer Date: Fri, 21 Mar 2025 19:06:01 +0100 Subject: [PATCH 07/15] - Testing. --- .github/workflows/check-jacoco.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/check-jacoco.yml b/.github/workflows/check-jacoco.yml index 57454c7..1c5098d 100644 --- a/.github/workflows/check-jacoco.yml +++ b/.github/workflows/check-jacoco.yml @@ -50,6 +50,7 @@ jobs: token: '${{ secrets.GITHUB_TOKEN }}' paths: | **/target/site/jacoco/jacoco.xml + title: JaCoCo code coverage report - Scala ${{ matrix.scala }} sensitivity: "detail" comment-mode: 'single' debug: 'true' From c54b95029874817b588173fb83f2cc346a8d59bc Mon Sep 17 00:00:00 2001 From: miroslavpojer Date: Fri, 21 Mar 2025 19:14:21 +0100 Subject: [PATCH 08/15] - Final version of branch jacoco-report. --- .github/workflows/check-jacoco.yml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/.github/workflows/check-jacoco.yml b/.github/workflows/check-jacoco.yml index 1c5098d..0745c78 100644 --- a/.github/workflows/check-jacoco.yml +++ b/.github/workflows/check-jacoco.yml @@ -55,18 +55,6 @@ jobs: comment-mode: 'single' debug: 'true' - - name: Add coverage to PR - id: jacoco-old - uses: madrapps/jacoco-report@v1.3 - with: - paths: ${{ github.workspace }}/target/site/jacoco/jacoco.xml - token: ${{ secrets.GITHUB_TOKEN }} - min-coverage-overall: 0.0 - min-coverage-changed-files: 80.0 - title: Old JaCoCo code coverage report - Scala ${{ matrix.scala }} - update-comment: true - - - name: Get the Coverage info run: | echo "Total coverage ${{ steps.jacoco.outputs.coverage-overall }}" From 81ae9612d1f1d7097e9f5fc8aa2e8752105a0bf4 Mon Sep 17 00:00:00 2001 From: miroslavpojer Date: Fri, 21 Mar 2025 19:33:37 +0100 Subject: [PATCH 09/15] - Removed final workflow check and failure. Newly it is part of new gh action. --- .github/workflows/check-jacoco.yml | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/.github/workflows/check-jacoco.yml b/.github/workflows/check-jacoco.yml index 0745c78..919be0a 100644 --- a/.github/workflows/check-jacoco.yml +++ b/.github/workflows/check-jacoco.yml @@ -53,15 +53,6 @@ jobs: title: JaCoCo code coverage report - Scala ${{ matrix.scala }} sensitivity: "detail" comment-mode: 'single' + min-coverage-overall: 80.0 + min-coverage-changed-files: 80.0 debug: 'true' - - - name: Get the Coverage info - run: | - echo "Total coverage ${{ steps.jacoco.outputs.coverage-overall }}" - echo "Changed Files coverage ${{ steps.jacoco.outputs.coverage-changed-files }}" - - name: Fail PR if changed files coverage is less than 80% - if: ${{ steps.jacoco.outputs.coverage-changed-files < 80.0 }} - uses: actions/github-script@v6 - with: - script: | - core.setFailed('Changed files coverage is less than 80%!') From 20c87bd294100173ce31b64c80644f058f03457f Mon Sep 17 00:00:00 2001 From: miroslavpojer Date: Sun, 23 Mar 2025 17:57:11 +0100 Subject: [PATCH 10/15] - Testing. --- .github/workflows/check-jacoco.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-jacoco.yml b/.github/workflows/check-jacoco.yml index 919be0a..bbb4fd8 100644 --- a/.github/workflows/check-jacoco.yml +++ b/.github/workflows/check-jacoco.yml @@ -45,7 +45,7 @@ jobs: - name: Add JaCoCo Report in PR comments id: jacoco - uses: MoranaApps/jacoco-report@feature/4-Integrate-with-1st-project + uses: MoranaApps/jacoco-report@feature/6-Improve-gh-action-output-for-modules with: token: '${{ secrets.GITHUB_TOKEN }}' paths: | From 9f5b62ab90727c301385743c53ee92307e5ee49c Mon Sep 17 00:00:00 2001 From: miroslavpojer Date: Sun, 23 Mar 2025 18:11:20 +0100 Subject: [PATCH 11/15] - Remove testing change. --- src/main/scala/za/co/absa/commons/buildinfo/PropMapping.scala | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/scala/za/co/absa/commons/buildinfo/PropMapping.scala b/src/main/scala/za/co/absa/commons/buildinfo/PropMapping.scala index e741b03..4f0f777 100644 --- a/src/main/scala/za/co/absa/commons/buildinfo/PropMapping.scala +++ b/src/main/scala/za/co/absa/commons/buildinfo/PropMapping.scala @@ -26,5 +26,4 @@ case class PropMapping( object PropMapping { final val Default: PropMapping = PropMapping() - } From 627c5e74e220014eff50412de140cc7672438668 Mon Sep 17 00:00:00 2001 From: miroslavpojer Date: Sun, 23 Mar 2025 19:38:54 +0100 Subject: [PATCH 12/15] - Use latest version of jacoco-report gh action. --- .github/workflows/check-jacoco.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-jacoco.yml b/.github/workflows/check-jacoco.yml index bbb4fd8..7ca930a 100644 --- a/.github/workflows/check-jacoco.yml +++ b/.github/workflows/check-jacoco.yml @@ -45,7 +45,7 @@ jobs: - name: Add JaCoCo Report in PR comments id: jacoco - uses: MoranaApps/jacoco-report@feature/6-Improve-gh-action-output-for-modules + uses: MoranaApps/jacoco-report@v0.2.0 with: token: '${{ secrets.GITHUB_TOKEN }}' paths: | From 5fd00c559f7d860e057301a83c9259798af35e34 Mon Sep 17 00:00:00 2001 From: miroslavpojer Date: Mon, 24 Mar 2025 08:03:21 +0100 Subject: [PATCH 13/15] - Remove debug mode. --- .github/workflows/check-jacoco.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/check-jacoco.yml b/.github/workflows/check-jacoco.yml index 7ca930a..91c59a3 100644 --- a/.github/workflows/check-jacoco.yml +++ b/.github/workflows/check-jacoco.yml @@ -55,4 +55,3 @@ jobs: comment-mode: 'single' min-coverage-overall: 80.0 min-coverage-changed-files: 80.0 - debug: 'true' From 2da6770c6d9f44d808a45e0cdec5595e7bc5dd45 Mon Sep 17 00:00:00 2001 From: miroslavpojer Date: Tue, 25 Mar 2025 10:02:02 +0100 Subject: [PATCH 14/15] - Update jacoco-report gh action version. --- .github/workflows/check-jacoco.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-jacoco.yml b/.github/workflows/check-jacoco.yml index 91c59a3..2cbe9ec 100644 --- a/.github/workflows/check-jacoco.yml +++ b/.github/workflows/check-jacoco.yml @@ -45,7 +45,7 @@ jobs: - name: Add JaCoCo Report in PR comments id: jacoco - uses: MoranaApps/jacoco-report@v0.2.0 + uses: MoranaApps/jacoco-report@v0.2.1 with: token: '${{ secrets.GITHUB_TOKEN }}' paths: | From 2efb63c8d855ac2dbb86ddfa37fca28047f7ebf1 Mon Sep 17 00:00:00 2001 From: miroslavpojer Date: Tue, 1 Apr 2025 14:59:02 +0200 Subject: [PATCH 15/15] - Decreased min overall threshold. --- .github/workflows/check-jacoco.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-jacoco.yml b/.github/workflows/check-jacoco.yml index 2cbe9ec..2fc74a2 100644 --- a/.github/workflows/check-jacoco.yml +++ b/.github/workflows/check-jacoco.yml @@ -53,5 +53,5 @@ jobs: title: JaCoCo code coverage report - Scala ${{ matrix.scala }} sensitivity: "detail" comment-mode: 'single' - min-coverage-overall: 80.0 + min-coverage-overall: 75.0 min-coverage-changed-files: 80.0