Skip to content

Commit 599e28d

Browse files
committed
improved version of the script to handle multiple projects
1 parent ac7dabb commit 599e28d

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

.github/workflows/analysis.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,4 +109,6 @@ jobs:
109109
run: |
110110
pwd
111111
ls -la
112-
node jacoco-report-generator.mjs ./client-v2/target/site/jacoco-aggregate/jacoco.csv coverage.md --pr ${{ github.event.pull_request.number }}
112+
node jacoco-report-generator.mjs ./client-v2/target/site/jacoco-aggregate/jacoco.csv client-v2-cov.md --pr ${{ github.event.pull_request.number }}
113+
node jacoco-report-generator.mjs ./jdbc-v2/target/site/jacoco-aggregate/jacoco.csv jdbc-v2-cov.md --pr ${{ github.event.pull_request.number }}
114+
cat *-cov.md

jacoco-report-generator.js

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ const generateJacocoReport = (csvFilePath, outputPath) => {
169169
});
170170

171171
rl.on('close', () => {
172-
// Generate package coverage report
172+
// Generate package coverage report with FQN
173173
const packageReport = Array.from(packageCoverage.entries())
174174
.map(([pkg, { covered, total }]) => ({
175175
package: pkg,
@@ -179,10 +179,10 @@ const generateJacocoReport = (csvFilePath, outputPath) => {
179179
}))
180180
.sort((a, b) => a.package.localeCompare(b.package));
181181

182-
// Generate class coverage report
182+
// Generate class coverage report with FQN
183183
const classReport = Array.from(classCoverage.entries())
184184
.map(([cls, { covered, total, coverage }]) => ({
185-
class: cls,
185+
class: cls, // This is already the FQN
186186
coverage,
187187
'lines covered': covered,
188188
'lines total': total
@@ -204,6 +204,7 @@ ${generateMarkdownTable(packageReport, {
204204
205205
<details>
206206
<summary>Class Coverage</summary>
207+
207208
${generateMarkdownTable(classReport, {
208209
'class': 'Class',
209210
'coverage': 'Coverage',
@@ -394,8 +395,10 @@ async function main() {
394395

395396
if (prNumber && githubToken) {
396397
try {
397-
const commentMarker = '<!-- jacoco-coverage-report -->';
398-
const comment = `${commentMarker}\n# JaCoCo Coverage Report\n\n${reportContent}`;
398+
// Extract project name from the path (first non-empty part after splitting by / or \)
399+
const projectName = inputFile.split(/[/\\]/).filter(Boolean)[0] || 'coverage';
400+
const commentMarker = `<!-- jacoco-coverage-report:${projectName} -->`;
401+
const comment = `${commentMarker}\n# Coverage Report (${projectName})\n\n${reportContent}`;
399402

400403
// Find existing comment to update
401404
const existingComment = await findExistingComment(

0 commit comments

Comments
 (0)