diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 503ef3ec..65afce3c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,8 +19,8 @@ jobs: - name: Set up JDK 17 uses: actions/setup-java@v3 with: - java-version: '17' - distribution: 'temurin' + java-version: 17 + distribution: temurin cache: maven - name: mvn install @@ -51,9 +51,3 @@ jobs: git commit -m "Autogenerated JaCoCo coverage badge" *.svg git push --set-upstream origin actions/badges fi - - - name: Upload JaCoCo coverage report - uses: actions/upload-artifact@v3 - with: - name: jacoco-report - path: spectrum/target/site/jacoco/ diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 0c3b06d2..05531a96 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -26,8 +26,8 @@ jobs: - name: Set up JDK 17 uses: actions/setup-java@v3 with: - java-version: '17' - distribution: 'temurin' + java-version: 17 + distribution: temurin cache: maven - name: Initialize CodeQL diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 1f1e0963..8861cdb9 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -13,7 +13,8 @@ jobs: name: github-pages url: ${{steps.deployment.outputs.page_url}} steps: - - uses: actions/checkout@v4 + - name: Checkout repository + uses: actions/checkout@v4 - name: Setup GitHub Pages uses: actions/configure-pages@v3 @@ -24,6 +25,16 @@ jobs: source: docs/ destination: ./_site + - name: Set up JDK 17 + uses: actions/setup-java@v3 + with: + java-version: 17 + distribution: temurin + cache: maven + + - name: Spectrum unit tests and JaCoCo reports + run: ./mvnw -B test -DskipSign -Dmaven.plugin.validation=BRIEF -pl spectrum + - name: Upload GitHub Pages Artifact uses: actions/upload-pages-artifact@v2 diff --git a/.github/workflows/stale-issues.yml b/.github/workflows/stale-issues.yml index d5cd3cf1..0342e821 100644 --- a/.github/workflows/stale-issues.yml +++ b/.github/workflows/stale-issues.yml @@ -1,7 +1,7 @@ name: Close inactive issues on: schedule: - - cron: "30 1 * * *" + - cron: 30 1 * * * jobs: close-issues: @@ -14,9 +14,9 @@ jobs: with: days-before-issue-stale: 30 days-before-issue-close: 14 - stale-issue-label: "stale" - stale-issue-message: "This issue is stale because it has been open for 30 days with no activity." - close-issue-message: "This issue was closed because it has been inactive for 14 days since being marked as stale." + stale-issue-label: stale + stale-issue-message: This issue is stale because it has been open for 30 days with no activity. + close-issue-message: This issue was closed because it has been inactive for 14 days since being marked as stale. days-before-pr-stale: -1 days-before-pr-close: -1 repo-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.gitignore b/.gitignore index 61f3308c..3de87f38 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ docs/.sass-cache docs/.jekyll-cache docs/.jekyll-metadata docs/vendor +docs/jacoco diff --git a/README.md b/README.md index 020bfd3d..2c3478f4 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@
[![Build](https://github.com/giulong/spectrum/actions/workflows/build.yml/badge.svg?branch=develop)](https://github.com/giulong/spectrum/actions?query=branch%3Adevelop) -![coverage](https://github.com/giulong/spectrum/blob/actions/badges/.github/badges/jacoco.svg) -![branches coverage](https://github.com/giulong/spectrum/blob/actions/badges/.github/badges/branches.svg) +![coverage](https://giulong.github.io/spectrum/jacoco/) +![branches coverage](https://giulong.github.io/spectrum/jacoco/) [![badge-jdk](https://img.shields.io/badge/jdk-17-blue.svg)](https://www.oracle.com/java/technologies/javase-downloads.html) [![License](https://img.shields.io/badge/License-Apache_2.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) [![Maven Central](https://img.shields.io/maven-central/v/io.github.giulong/spectrum.svg)](https://search.maven.org/search?q=g:io.github.giulong%20a:spectrum) diff --git a/pom.xml b/pom.xml index 1664797e..85813d7c 100644 --- a/pom.xml +++ b/pom.xml @@ -36,7 +36,8 @@ 1.5.0 UTF-8 UTF-8 - ${project.reporting.outputDirectory}/jacoco + docs + ${docs.folder}/jacoco src/main/resources org.junit.platform.launcher.LauncherSessionListener @@ -310,6 +311,16 @@ org.apache.maven.plugins maven-clean-plugin + + + + ${jacoco.outputDirectory} + + ** + + + + org.apache.maven.plugins diff --git a/spectrum/pom.xml b/spectrum/pom.xml index 90b14e89..7df3373e 100644 --- a/spectrum/pom.xml +++ b/spectrum/pom.xml @@ -238,7 +238,7 @@ report - ${jacoco.outputDirectory} + ${project.parent.basedir}/${jacoco.outputDirectory}