From 43cea58fa109d36abb116543a6cf529b55774af0 Mon Sep 17 00:00:00 2001 From: Stefan Verhoeven Date: Mon, 20 Nov 2023 11:48:57 +0100 Subject: [PATCH 1/3] Use latest maven-dependency-submission-action --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8b84b62..7809091 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,4 +32,4 @@ jobs: # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive - name: Update dependency graph - uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6 + uses: advanced-security/maven-dependency-submission-action@v3 \ No newline at end of file From 8a82167e9ebb6c959545c251f7cb1964eef3c3c9 Mon Sep 17 00:00:00 2001 From: Stefan Verhoeven Date: Mon, 20 Nov 2023 12:09:07 +0100 Subject: [PATCH 2/3] Replace codacy coverage report with GH actions --- .github/badges/jacoco.svg | 1 + .github/workflows/ci.yml | 20 +++++++++++++++++++- README.md | 3 ++- tests/pom.xml | 1 + 4 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 .github/badges/jacoco.svg diff --git a/.github/badges/jacoco.svg b/.github/badges/jacoco.svg new file mode 100644 index 0000000..eeebec0 --- /dev/null +++ b/.github/badges/jacoco.svg @@ -0,0 +1 @@ +coverage48.9% \ No newline at end of file diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7809091..e3a9388 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,6 +30,24 @@ jobs: - name: Package run: mvn -B package + - name: Generate JaCoCo Badge + uses: cicirello/jacoco-badge-generator@v2 + with: + jacoco-csv-file: tests/target/jacoco/report/jacoco.csv + + - name: Commit and push the badge (if it changed) + uses: EndBug/add-and-commit@v7 + with: + default_author: github_actions + message: 'commit badge' + add: '*.svg' + + - name: Upload JaCoCo coverage report + uses: actions/upload-artifact@v3 + with: + name: jacoco-report + path: tests/target/jacoco/report/ + # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive - name: Update dependency graph - uses: advanced-security/maven-dependency-submission-action@v3 \ No newline at end of file + uses: advanced-security/maven-dependency-submission-action@v3 diff --git a/README.md b/README.md index e3d4612..229f8e6 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ Test Knime workflows from a Junit test. -[![Codacy Badge](https://api.codacy.com/project/badge/Grade/ba09652161144d9abbe4827fd16bbaec)](https://www.codacy.com/app/3D-e-Chem/knime-testflow?utm_source=github.com&utm_medium=referral&utm_content=3D-e-Chem/knime-testflow&utm_campaign=Badge_Grade) +[![Java CI with Maven](https://github.com/3D-e-Chem/knime-testflow/actions/workflows/ci.yml/badge.svg)](https://github.com/3D-e-Chem/knime-testflow/actions/workflows/ci.yml) +![Coverage](.github/badges/jacoco.svg) [![DOI](https://zenodo.org/badge/doi/10.5281/zenodo.55805.svg)](http://dx.doi.org/10.5281/zenodo.55805) The Knime Testing Framework can run a test workflow either: diff --git a/tests/pom.xml b/tests/pom.xml index 30abed3..0b3ccab 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -85,6 +85,7 @@ + From 7b332d307effc6981e5d8f4dc367c47f40b4df77 Mon Sep 17 00:00:00 2001 From: Stefan Verhoeven Date: Mon, 20 Nov 2023 13:18:51 +0100 Subject: [PATCH 3/3] Less warnings during build --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e3a9388..9a2803e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,11 +36,11 @@ jobs: jacoco-csv-file: tests/target/jacoco/report/jacoco.csv - name: Commit and push the badge (if it changed) - uses: EndBug/add-and-commit@v7 + uses: EndBug/add-and-commit@v9 with: default_author: github_actions message: 'commit badge' - add: '*.svg' + add: '.github/badges/jacoco.svg' - name: Upload JaCoCo coverage report uses: actions/upload-artifact@v3