run cleanup before folder listing (#16)

mgrybyk-org · Feb 8, 2024 · 8227e48 · 8227e48
1 parent da3bccb
commit 8227e48
Show file tree

Hide file tree

Showing 4 changed files with 130 additions and 117 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -29369,6 +29369,13 @@ try {
     }
     // action
     await _actions_io__WEBPACK_IMPORTED_MODULE_3__.mkdirP(reportBaseDir);
+    // cleanup (should be before the folder listing)
+    if (branchCleanupEnabled) {
+        await (0,_src_cleanup_js__WEBPACK_IMPORTED_MODULE_7__/* .cleanupOutdatedBranches */ .B)(ghPagesBaseDir, _actions_github__WEBPACK_IMPORTED_MODULE_2__.context.repo);
+    }
+    if (maxReports > 0) {
+        await (0,_src_cleanup_js__WEBPACK_IMPORTED_MODULE_7__/* .cleanupOutdatedReports */ .g)(ghPagesBaseDir, maxReports);
+    }
     // folder listing
     if (listDirs) {
         if (await (0,_src_writeFolderListing_js__WEBPACK_IMPORTED_MODULE_4__/* .shouldWriteRootHtml */ .z)(ghPagesPath)) {
@@ -29404,12 +29411,6 @@ try {
     _actions_core__WEBPACK_IMPORTED_MODULE_1__.setOutput('test_result_total', results.total);
     _actions_core__WEBPACK_IMPORTED_MODULE_1__.setOutput('run_unique_id', runUniqueId);
     _actions_core__WEBPACK_IMPORTED_MODULE_1__.setOutput('report_path', reportDir);
-    if (branchCleanupEnabled) {
-        await (0,_src_cleanup_js__WEBPACK_IMPORTED_MODULE_7__/* .cleanupOutdatedBranches */ .B)(ghPagesBaseDir, _actions_github__WEBPACK_IMPORTED_MODULE_2__.context.repo);
-    }
-    if (maxReports > 0) {
-        await (0,_src_cleanup_js__WEBPACK_IMPORTED_MODULE_7__/* .cleanupOutdatedReports */ .g)(ghPagesBaseDir, maxReports);
-    }
 }
 catch (error) {
     _actions_core__WEBPACK_IMPORTED_MODULE_1__.setFailed(error.message);

diff --git a/index.ts b/index.ts
@@ -77,6 +77,14 @@ try {
     // action
     await io.mkdirP(reportBaseDir)
 
+    // cleanup (should be before the folder listing)
+    if (branchCleanupEnabled) {
+        await cleanupOutdatedBranches(ghPagesBaseDir, github.context.repo)
+    }
+    if (maxReports > 0) {
+        await cleanupOutdatedReports(ghPagesBaseDir, maxReports)
+    }
+
     // folder listing
     if (listDirs) {
         if (await shouldWriteRootHtml(ghPagesPath)) {
@@ -114,13 +122,6 @@ try {
     core.setOutput('test_result_total', results.total)
     core.setOutput('run_unique_id', runUniqueId)
     core.setOutput('report_path', reportDir)
-
-    if (branchCleanupEnabled) {
-        await cleanupOutdatedBranches(ghPagesBaseDir, github.context.repo)
-    }
-    if (maxReports > 0) {
-        await cleanupOutdatedReports(ghPagesBaseDir, maxReports)
-    }
 } catch (error) {
     core.setFailed(error.message)
 }