From e87994a48b080a363899c65da8499a276929d9f1 Mon Sep 17 00:00:00 2001 From: Timon Back Date: Sat, 22 Apr 2023 00:12:11 +0200 Subject: [PATCH 1/4] Add sonarcloud --- springwolf-core/build.gradle | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/springwolf-core/build.gradle b/springwolf-core/build.gradle index f32c180a0..b4d63f9e2 100644 --- a/springwolf-core/build.gradle +++ b/springwolf-core/build.gradle @@ -6,6 +6,8 @@ plugins { id 'org.springframework.boot' version '3.0.2' id 'io.spring.dependency-management' version '1.1.0' + + id "org.sonarqube" version "3.5.0.2730" } def isSnapshot = Boolean.valueOf(project.findProperty('SNAPSHOT')) @@ -131,3 +133,12 @@ signing { useInMemoryPgpKeys(signingKey, signingPassword) sign publishing.publications.mavenJava } + +sonarqube { + properties { + property "sonar.projectKey", "timonback_springwolf-core" + property "sonar.organization", "timonback" + property "sonar.host.url", "https://sonarcloud.io" + } +} + From 9008b5c22aa0a1ef1492f0540e4326085741aca5 Mon Sep 17 00:00:00 2001 From: Timon Back Date: Sat, 22 Apr 2023 00:14:53 +0200 Subject: [PATCH 2/4] Update springwolf-core.yml --- .github/workflows/springwolf-core.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/springwolf-core.yml b/.github/workflows/springwolf-core.yml index 192daa796..fb59a79d5 100644 --- a/.github/workflows/springwolf-core.yml +++ b/.github/workflows/springwolf-core.yml @@ -30,6 +30,18 @@ jobs: - name: Build with Gradle run: ./gradlew -p springwolf-core build + - name: Cache SonarCloud packages + uses: actions/cache@v3 + with: + path: ~/.sonar/cache + key: ${{ runner.os }}-sonar + restore-keys: ${{ runner.os }}-sonar + - name: Run SonarCloud analysis + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + run: ./gradlew -p springwolf-core sonarqube --info + - name: Publish package if: github.ref == 'refs/heads/master' run: ./gradlew -p springwolf-core publish From 4192f40b07dbe9361fe996b2546c4c1ecbc44fae Mon Sep 17 00:00:00 2001 From: Timon Back Date: Sat, 22 Apr 2023 00:23:09 +0200 Subject: [PATCH 3/4] Update springwolf-core.yml --- .github/workflows/springwolf-core.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/springwolf-core.yml b/.github/workflows/springwolf-core.yml index fb59a79d5..9ea717de9 100644 --- a/.github/workflows/springwolf-core.yml +++ b/.github/workflows/springwolf-core.yml @@ -40,7 +40,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - run: ./gradlew -p springwolf-core sonarqube --info + run: ./gradlew -p springwolf-core build sonarqube --info - name: Publish package if: github.ref == 'refs/heads/master' From 3baa5573471bf6131f4149745d73504acfff3160 Mon Sep 17 00:00:00 2001 From: Timon Back Date: Sat, 22 Apr 2023 00:26:02 +0200 Subject: [PATCH 4/4] Enable jacoco --- springwolf-core/build.gradle | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/springwolf-core/build.gradle b/springwolf-core/build.gradle index b4d63f9e2..103695255 100644 --- a/springwolf-core/build.gradle +++ b/springwolf-core/build.gradle @@ -7,7 +7,8 @@ plugins { id 'org.springframework.boot' version '3.0.2' id 'io.spring.dependency-management' version '1.1.0' - id "org.sonarqube" version "3.5.0.2730" + id 'org.sonarqube' version "3.5.0.2730" + id 'jacoco' } def isSnapshot = Boolean.valueOf(project.findProperty('SNAPSHOT')) @@ -65,6 +66,11 @@ java { test { useJUnitPlatform() } +jacocoTestReport { + reports { + xml.required = true + } +} publishing { publications {