clean up and fix logs

Author: mydea

dev-packages/clear-cache-gh-action/index.mjs

@@ -51,14 +51,16 @@ async function clearGithubCaches(octokit, { repo, owner, clearDevelop, clearPend
       break;
     }
 
-    for (const { id, ref, size_in_bytes } of response.data) {
-      core.info(`Checking cache ${id} for ${ref}...`);
+    /**
+     * Clear caches.
+     *
+     * @param {{ref: string}} options
+     */
+    const shouldClearCache = async ({ ref }) => {
       // Do not clear develop caches if clearDevelop is false.
       if (!clearDevelop && ref === 'refs/heads/develop') {
         core.info('> Keeping cache because it is on develop.');
-        remainingCaches++;
-        remainingSize += size_in_bytes;
-        continue;
+        return false;
       }
 
       // There are two fundamental paths here:
@@ -101,46 +103,54 @@ async function clearGithubCaches(octokit, { repo, owner, clearDevelop, clearPend
         // No relevant workflow? Clear caches!
         if (!latestWorkflowRun) {
           core.info('> Clearing cache because no relevant workflow was found.');
-          continue;
+          return true;
         }
 
         // If the latest run was not successful, keep caches
         // as either the run may be in progress,
         // or failed - in which case we may want to re-run the workflow
         if (latestWorkflowRun.conclusion !== 'success') {
           core.info(`> Keeping cache because latest workflow is ${latestWorkflowRun.conclusion}.`);
-          continue;
+          return false;
         }
 
         core.info(`> Clearing cache because latest workflow run is ${latestWorkflowRun.conclusion}.`);
       } else if (isPr) {
         // Case 2: This is a PR, but we do not want to clear pending PRs
         // In this case, this cache should never be cleared
         core.info('> Keeping cache of every PR workflow run.');
-        remainingCaches++;
-        remainingSize += size_in_bytes;
-        continue;
+        return false;
       } else if (clearBranches) {
         // Case 3: This is not a PR, and we want to clean branches
         core.info('> Clearing cache because it is not a PR.');
+        return true;
       } else {
         // Case 4: This is not a PR, and we do not want to clean branches
         core.info('> Keeping cache for non-PR workflow run.');
-        remainingCaches++;
-        remainingSize += size_in_bytes;
-        continue;
+        return false;
       }
+    };
 
-      core.info(`> Clearing cache ${id}...`);
+    for (const { id, ref, size_in_bytes } of response.data) {
+      core.info(`Checking cache ${id} for ${ref}...`);
+
+      const shouldDelete = await shouldClearCache({ ref });
+
+      if (shouldDelete) {
+        core.info(`> Clearing cache ${id}...`);
 
-      deletedCaches++;
-      deletedSize += size_in_bytes;
+        deletedCaches++;
+        deletedSize += size_in_bytes;
 
-      /*  await octokit.rest.actions.deleteActionsCacheById({
+        /*  await octokit.rest.actions.deleteActionsCacheById({
         owner,
         repo,
         cache_id: id,
       }); */
+      } else {
+        remainingCaches++;
+        remainingSize += size_in_bytes;
+      }
     }
 
     const format = new Intl.NumberFormat('en-US', {