diff --git a/dist/cleanup/index.js b/dist/cleanup/index.js index 2e958bc..88c149a 100644 --- a/dist/cleanup/index.js +++ b/dist/cleanup/index.js @@ -81875,12 +81875,12 @@ function generateReports() { shas.push(pushEvents[i].payload.commits[pushEvents[i].payload.commits.length - 1].sha); } const imageData = yield (0, utils_1.getImageData)(shas); - const mermaidDiagramm = createHistoryDiagramm(shas, imageData); + const commitDates = (0, utils_1.formatTimestamps)(timestamps); + const mermaidDiagramm = createHistoryDiagramm(shas, imageData, commitDates); core.info(mermaidDiagramm); core.summary.addRaw(mermaidDiagramm); yield core.summary.write(); // Extract data for plotting - const commitDates = (0, utils_1.formatTimestamps)(timestamps); core.info(JSON.stringify(commitDates)); } if (arePRBaseComparisonEnabled()) { @@ -81968,7 +81968,7 @@ gantt <em>Report generated by <a href="https://github.com/marketplace/actions/github-action-for-graalvm" target="_blank">setup-graalvm</a>.</em>`; } -function createHistoryDiagramm(shas, metricDataList) { +function createHistoryDiagramm(shas, metricDataList, commitDates) { let mermaidDiagramm = `## GraalVM Native Image PR comparison #### Image Details @@ -81984,7 +81984,7 @@ gantt for (let i = 0; i < metricDataList.length; i++) { mermaidDiagramm = mermaidDiagramm + ` section ${shas[i].slice(0, 8)}... - ${bytesToHuman(JSON.parse(metricDataList[i]).image_details.total_bytes)}: ${shas[i] === process.env.GITHUB_SHA ? 'active, ' : ''} 0, ${JSON.parse(metricDataList[i]).image_details.total_bytes} + ${commitDates[i]} (${bytesToHuman(JSON.parse(metricDataList[i]).image_details.total_bytes)}): ${shas[i] === process.env.GITHUB_SHA ? 'active, ' : ''} 0, ${JSON.parse(metricDataList[i]).image_details.total_bytes} `; } @@ -82610,7 +82610,7 @@ function formatTimestamps(timestamps) { let commitTime = luxon_1.DateTime.fromISO(timestamps[i]); let commitTimeUtc = commitTime.setZone('UTC'); let commitTimeLocal = commitTimeUtc.setZone('Europe/Berlin'); - let formatter = 'dd.MM.\'HH:mm'; + let formatter = 'dd.MM'; formattedTimestamps.push(commitTimeLocal.toFormat(formatter)); } return (formattedTimestamps); diff --git a/dist/main/index.js b/dist/main/index.js index 0d4e537..08bbd80 100644 --- a/dist/main/index.js +++ b/dist/main/index.js @@ -81974,12 +81974,12 @@ function generateReports() { shas.push(pushEvents[i].payload.commits[pushEvents[i].payload.commits.length - 1].sha); } const imageData = yield (0, utils_1.getImageData)(shas); - const mermaidDiagramm = createHistoryDiagramm(shas, imageData); + const commitDates = (0, utils_1.formatTimestamps)(timestamps); + const mermaidDiagramm = createHistoryDiagramm(shas, imageData, commitDates); core.info(mermaidDiagramm); core.summary.addRaw(mermaidDiagramm); yield core.summary.write(); // Extract data for plotting - const commitDates = (0, utils_1.formatTimestamps)(timestamps); core.info(JSON.stringify(commitDates)); } if (arePRBaseComparisonEnabled()) { @@ -82067,7 +82067,7 @@ gantt <em>Report generated by <a href="https://github.com/marketplace/actions/github-action-for-graalvm" target="_blank">setup-graalvm</a>.</em>`; } -function createHistoryDiagramm(shas, metricDataList) { +function createHistoryDiagramm(shas, metricDataList, commitDates) { let mermaidDiagramm = `## GraalVM Native Image PR comparison #### Image Details @@ -82083,7 +82083,7 @@ gantt for (let i = 0; i < metricDataList.length; i++) { mermaidDiagramm = mermaidDiagramm + ` section ${shas[i].slice(0, 8)}... - ${bytesToHuman(JSON.parse(metricDataList[i]).image_details.total_bytes)}: ${shas[i] === process.env.GITHUB_SHA ? 'active, ' : ''} 0, ${JSON.parse(metricDataList[i]).image_details.total_bytes} + ${commitDates[i]} (${bytesToHuman(JSON.parse(metricDataList[i]).image_details.total_bytes)}): ${shas[i] === process.env.GITHUB_SHA ? 'active, ' : ''} 0, ${JSON.parse(metricDataList[i]).image_details.total_bytes} `; } @@ -83686,7 +83686,7 @@ function formatTimestamps(timestamps) { let commitTime = luxon_1.DateTime.fromISO(timestamps[i]); let commitTimeUtc = commitTime.setZone('UTC'); let commitTimeLocal = commitTimeUtc.setZone('Europe/Berlin'); - let formatter = 'dd.MM.\'HH:mm'; + let formatter = 'dd.MM'; formattedTimestamps.push(commitTimeLocal.toFormat(formatter)); } return (formattedTimestamps); diff --git a/src/features/reports.ts b/src/features/reports.ts index db287a7..cc04478 100644 --- a/src/features/reports.ts +++ b/src/features/reports.ts @@ -161,13 +161,13 @@ export async function generateReports(): Promise<void> { } const imageData = await getImageData(shas) - const mermaidDiagramm = createHistoryDiagramm(shas, imageData) + const commitDates = formatTimestamps(timestamps) + const mermaidDiagramm = createHistoryDiagramm(shas, imageData, commitDates) core.info(mermaidDiagramm) core.summary.addRaw(mermaidDiagramm) await core.summary.write() // Extract data for plotting - const commitDates = formatTimestamps(timestamps) core.info(JSON.stringify(commitDates)) @@ -271,7 +271,7 @@ gantt <em>Report generated by <a href="https://github.com/marketplace/actions/github-action-for-graalvm" target="_blank">setup-graalvm</a>.</em>` } -function createHistoryDiagramm(shas: String[], metricDataList: any[]): string { +function createHistoryDiagramm(shas: String[], metricDataList: any[], commitDates: any[]): string { let mermaidDiagramm = `## GraalVM Native Image PR comparison #### Image Details @@ -287,7 +287,7 @@ gantt for (let i=0; i<metricDataList.length; i++) { mermaidDiagramm = mermaidDiagramm + ` section ${shas[i].slice(0, 8)}... - ${bytesToHuman(JSON.parse(metricDataList[i]).image_details.total_bytes)}: ${shas[i] === process.env.GITHUB_SHA? 'active, ': ''} 0, ${JSON.parse(metricDataList[i]).image_details.total_bytes} + ${commitDates[i]} (${bytesToHuman(JSON.parse(metricDataList[i]).image_details.total_bytes)}): ${shas[i] === process.env.GITHUB_SHA? 'active, ': ''} 0, ${JSON.parse(metricDataList[i]).image_details.total_bytes} ` } diff --git a/src/utils.ts b/src/utils.ts index 81e072b..f231183 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -394,7 +394,7 @@ export function formatTimestamps(timestamps: string[]) { let commitTime = DateTime.fromISO(timestamps[i]); let commitTimeUtc = commitTime.setZone('UTC'); let commitTimeLocal = commitTimeUtc.setZone('Europe/Berlin'); - let formatter = 'dd.MM.\'HH:mm'; + let formatter = 'dd.MM'; formattedTimestamps.push(commitTimeLocal.toFormat(formatter)); } return(formattedTimestamps)