fix cleanup

mgrybyk-org · Jul 23, 2024 · c21ca5c · c21ca5c
1 parent 50a639a
commit c21ca5c
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 2 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -41540,6 +41540,17 @@ const cleanupOutdatedBranches = async (ghPagesBaseDir) => {
         console.error('cleanup outdated branches failed.', err);
     }
 };
+const sortRuns = (a, b) => {
+    const tsA = a.split('_')[1];
+    const tsb = b.split('_')[1];
+    if (tsA < tsb) {
+        return -1;
+    }
+    if (tsA > tsb) {
+        return 1;
+    }
+    return 0;
+};
 const cleanupOutdatedReports = async (ghPagesBaseDir, maxReports) => {
     try {
         const localBranches = (await promises_.readdir(ghPagesBaseDir, { withFileTypes: true })).filter((d) => d.isDirectory()).map((d) => d.name);
@@ -41555,7 +41566,7 @@ const cleanupOutdatedReports = async (ghPagesBaseDir, maxReports) => {
                     .map((d) => d.name);
                 // run per report
                 if (runs.length > maxReports) {
-                    runs.sort();
+                    runs.sort(sortRuns);
                     while (runs.length > maxReports) {
                         await promises_.rm(external_path_.join(ghPagesBaseDir, localBranch, reportName, runs.shift()), {
                             recursive: true,

diff --git a/src/cleanup.ts b/src/cleanup.ts
@@ -24,6 +24,19 @@ export const cleanupOutdatedBranches = async (ghPagesBaseDir: string) => {
     }
 }
 
+const sortRuns = (a: string, b: string) => {
+    const tsA = a.split('_')[1]
+    const tsb = b.split('_')[1]
+    if (tsA < tsb) {
+        return -1
+    }
+    if (tsA > tsb) {
+        return 1
+    }
+
+    return 0
+}
+
 export const cleanupOutdatedReports = async (ghPagesBaseDir: string, maxReports: number) => {
     try {
         const localBranches = (await fs.readdir(ghPagesBaseDir, { withFileTypes: true })).filter((d) => d.isDirectory()).map((d) => d.name)
@@ -42,7 +55,7 @@ export const cleanupOutdatedReports = async (ghPagesBaseDir: string, maxReports:
 
                 // run per report
                 if (runs.length > maxReports) {
-                    runs.sort()
+                    runs.sort(sortRuns)
                     while (runs.length > maxReports) {
                         await fs.rm(path.join(ghPagesBaseDir, localBranch, reportName, runs.shift() as string), {
                             recursive: true,