upload checkstyle report, always upload artifacts

ministryofjustice · Feb 12, 2025 · f5ec411 · f5ec411
1 parent ce96ad0
commit f5ec411
Show file tree

Hide file tree

Showing 5 changed files with 87 additions and 4 deletions.
diff --git a/.github/workflows/feature-branch.yml b/.github/workflows/feature-branch.yml
@@ -46,10 +46,13 @@ jobs:
         uses: gradle/actions/setup-gradle@v4
 
       - name: Build & test
-        run: ./gradlew build jacocoTestCoverageVerification -Pversion=${{ steps.capture_version.outputs.app_version }}
+        run: ./gradlew build -Pversion=${{ steps.capture_version.outputs.app_version }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Test coverage verification
+        run: ./gradlew jacocoTestCoverageVerification
+
       - name: Integration test
         run: ./gradlew integrationTest -Pversion=${{ steps.capture_version.outputs.app_version }}
 
@@ -64,6 +67,30 @@ jobs:
           name: data-api-jar
           path: data-service/build/libs/data-service-${{ steps.capture_version.outputs.app_version }}.jar
 
+      - name: Upload checkstyle report
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: checkstyle-report
+          path: data-service/build/reports/checkstyle
+          retention-days: 14
+
+      - name: Upload test report
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: test-report
+          path: data-service/build/reports/tests
+          retention-days: 14
+
+      - name: Upload jacoco coverage report
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: jacoco-coverage-report
+          path: data-service/build/reports/jacoco
+          retention-days: 14
+
   ecr:
     needs: [ build-test-publish, define-image-tag ]
     runs-on: ubuntu-latest

diff --git a/.github/workflows/pr-merge-main.yml b/.github/workflows/pr-merge-main.yml
@@ -35,10 +35,13 @@ jobs:
         uses: gradle/actions/setup-gradle@v4
 
       - name: Build & test
-        run: ./gradlew build jacocoTestCoverageVerification
+        run: ./gradlew build
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Test coverage verification
+        run: ./gradlew jacocoTestCoverageVerification
+
       - name: Integration test
         run: ./gradlew integrationTest
 
@@ -50,6 +53,30 @@ jobs:
       - name: Update version
         run: ./gradlew release -Prelease.useAutomaticVersion=true
 
+      - name: Upload checkstyle report
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: checkstyle-report
+          path: data-service/build/reports/checkstyle
+          retention-days: 14
+
+      - name: Upload test report
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: test-report
+          path: data-service/build/reports/tests
+          retention-days: 14
+
+      - name: Upload jacoco coverage report
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: jacoco-coverage-report
+          path: data-service/build/reports/jacoco
+          retention-days: 14
+
   vulnerability-report:
     if: github.event.pull_request.merged == true
     runs-on: ubuntu-latest

diff --git a/.github/workflows/push-branch.yml b/.github/workflows/push-branch.yml
@@ -32,10 +32,13 @@ jobs:
         uses: gradle/actions/setup-gradle@v4
 
       - name: Build & test
-        run: ./gradlew build jacocoTestCoverageVerification
+        run: ./gradlew build
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Test coverage verification
+        run: ./gradlew jacocoTestCoverageVerification
+
       - name: Integration test
         run: ./gradlew integrationTest
 
@@ -47,6 +50,30 @@ jobs:
         env:
             GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Upload checkstyle report
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: checkstyle-report
+          path: data-service/build/reports/checkstyle
+          retention-days: 14
+
+      - name: Upload test report
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: test-report
+          path: data-service/build/reports/tests
+          retention-days: 14
+
+      - name: Upload jacoco coverage report
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: jacoco-coverage-report
+          path: data-service/build/reports/jacoco
+          retention-days: 14
+
   vulnerability-scan:
     runs-on: ubuntu-latest
 

diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'net.researchgate.release' version '3.0.2'
-    id 'uk.gov.laa.ccms.springboot.laa-ccms-spring-boot-gradle-plugin' version '0.0.24' apply false
+    id 'uk.gov.laa.ccms.springboot.laa-ccms-spring-boot-gradle-plugin' version '0.0.25' apply false
 }
 
 subprojects {

diff --git a/data-service/build.gradle b/data-service/build.gradle
@@ -40,6 +40,8 @@ test {
 
     // Hide warning for dynamic loading of agents https://github.com/mockito/mockito/issues/3037
     jvmArgs '-XX:+EnableDynamicAgentLoading'
+
+    finalizedBy jacocoTestReport
 }
 
 jacocoTestReport {