Handle failure in cache-cleanup

Do not abort the remainder of the post-action on failure in cache-cleanup. Instead, just log a warning and continue. Fixes #858 Fixes #990
gradle · Dec 12, 2023 · a71aff6 · a71aff6
1 parent 77699ba
commit a71aff6
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 5 deletions.
diff --git a/dist/main/index.js b/dist/main/index.js
@@ -93490,7 +93490,12 @@ function save(gradleUserHome, cacheListener, daemonController) {
         if ((0, cache_utils_1.isCacheCleanupEnabled)()) {
             core.info('Forcing cache cleanup.');
             const cacheCleaner = new cache_cleaner_1.CacheCleaner(gradleUserHome, process.env['RUNNER_TEMP']);
-            yield cacheCleaner.forceCleanup();
+            try {
+                yield cacheCleaner.forceCleanup();
+            }
+            catch (e) {
+                core.warning(`Cache cleanup failed. Will continue. ${String(e)}`);
+            }
         }
         yield core.group('Caching Gradle state', () => __awaiter(this, void 0, void 0, function* () {
             return new cache_base_1.GradleStateCache(gradleUserHome).save(cacheListener);

diff --git a/dist/main/index.js.map b/dist/main/index.js.map
diff --git a/dist/post/index.js b/dist/post/index.js
@@ -93490,7 +93490,12 @@ function save(gradleUserHome, cacheListener, daemonController) {
         if ((0, cache_utils_1.isCacheCleanupEnabled)()) {
             core.info('Forcing cache cleanup.');
             const cacheCleaner = new cache_cleaner_1.CacheCleaner(gradleUserHome, process.env['RUNNER_TEMP']);
-            yield cacheCleaner.forceCleanup();
+            try {
+                yield cacheCleaner.forceCleanup();
+            }
+            catch (e) {
+                core.warning(`Cache cleanup failed. Will continue. ${String(e)}`);
+            }
         }
         yield core.group('Caching Gradle state', () => __awaiter(this, void 0, void 0, function* () {
             return new cache_base_1.GradleStateCache(gradleUserHome).save(cacheListener);

diff --git a/dist/post/index.js.map b/dist/post/index.js.map
diff --git a/src/caches.ts b/src/caches.ts
@@ -90,7 +90,11 @@ export async function save(
     if (isCacheCleanupEnabled()) {
         core.info('Forcing cache cleanup.')
         const cacheCleaner = new CacheCleaner(gradleUserHome, process.env['RUNNER_TEMP']!)
-        await cacheCleaner.forceCleanup()
+        try {
+            await cacheCleaner.forceCleanup()
+        } catch (e) {
+            core.warning(`Cache cleanup failed. Will continue. ${String(e)}`)
+        }
     }
 
     await core.group('Caching Gradle state', async () => {