@@ -55,16 +55,28 @@ jobs:
5555 cd ../..
5656
5757 COVERAGE_UNIT_ONLY=true make test-coverage
58+
5859 cd pathology-api/test-artefacts
5960 mv coverage-merged.xml "${{ steps.create-name.outputs.artefact-name }}.xml"
6061
62+ cd ../..
63+ cd mocks/test-artefacts
64+ mv coverage-merged.xml "${{ steps.create-name.outputs.artefact-name }}-mocks.xml"
65+
6166 - name : " Upload combined coverage report"
6267 uses : actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
6368 with :
6469 name : ${{ steps.create-name.outputs.artefact-name }}
6570 path : pathology-api/test-artefacts
6671 retention-days : 30
6772
73+ - name : " Upload mocks coverage report"
74+ uses : actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
75+ with :
76+ name : ${{ steps.create-name.outputs.artefact-name }}-mocks
77+ path : mocks/test-artefacts
78+ retention-days : 30
79+
6880 sonarcloud-analysis :
6981 name : " SonarCloud Analysis"
7082 needs : run-tests
@@ -77,17 +89,23 @@ jobs:
7789 with :
7890 fetch-depth : 0 # Fetch all history for accurate SonarCloud analysis
7991
92+ - name : " Create coverage artefact name"
93+ id : create-name
94+ uses : ./.github/actions/create-artefact-name
95+ with :
96+ prefix : coverage
97+
8098 - name : " Download merged coverage report"
8199 uses : actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
82100 with :
83101 name : ${{ steps.create-name.outputs.artefact-name }}
84102 path : coverage-reports/
85103
86- - name : " Create coverage artefact name"
87- id : create-name
88- uses : ./.github/actions/create-artefact-name
104+ - name : " Download mock coverage report"
105+ uses : actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
89106 with :
90- prefix : coverage
107+ name : ${{ steps.create-name.outputs.artefact-name }}-mocks
108+ path : coverage-reports/
91109
92110 - name : " SonarCloud Scan"
93111 uses : SonarSource/sonarqube-scan-action@a31c9398be7ace6bbfaf30c0bd5d415f843d45e9 # 7.0.0
97115 args : >
98116 -Dsonar.organization=${{ vars.SONAR_ORGANISATION_KEY }}
99117 -Dsonar.projectKey=${{ vars.SONAR_PROJECT_KEY }}
100- -Dsonar.python.coverage.reportPaths=coverage-reports/${{ steps.create-name.outputs.artefact-name }}/${{ steps.create-name.outputs.artefact-name }}.xml
118+ -Dsonar.python.coverage.reportPaths=coverage-reports/${{ steps.create-name.outputs.artefact-name }}.xml,coverage-reports /${{ steps.create-name.outputs.artefact-name }}-mocks .xml
101119
0 commit comments