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
This commit is contained in:
daz 2023-12-11 20:38:28 -07:00
parent 77699bae74
commit a71aff6a12
No known key found for this signature in database
5 changed files with 19 additions and 5 deletions

7
dist/main/index.js vendored
View file

@ -93490,7 +93490,12 @@ function save(gradleUserHome, cacheListener, daemonController) {
if ((0, cache_utils_1.isCacheCleanupEnabled)()) { if ((0, cache_utils_1.isCacheCleanupEnabled)()) {
core.info('Forcing cache cleanup.'); core.info('Forcing cache cleanup.');
const cacheCleaner = new cache_cleaner_1.CacheCleaner(gradleUserHome, process.env['RUNNER_TEMP']); 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* () { yield core.group('Caching Gradle state', () => __awaiter(this, void 0, void 0, function* () {
return new cache_base_1.GradleStateCache(gradleUserHome).save(cacheListener); return new cache_base_1.GradleStateCache(gradleUserHome).save(cacheListener);

File diff suppressed because one or more lines are too long

7
dist/post/index.js vendored
View file

@ -93490,7 +93490,12 @@ function save(gradleUserHome, cacheListener, daemonController) {
if ((0, cache_utils_1.isCacheCleanupEnabled)()) { if ((0, cache_utils_1.isCacheCleanupEnabled)()) {
core.info('Forcing cache cleanup.'); core.info('Forcing cache cleanup.');
const cacheCleaner = new cache_cleaner_1.CacheCleaner(gradleUserHome, process.env['RUNNER_TEMP']); 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* () { yield core.group('Caching Gradle state', () => __awaiter(this, void 0, void 0, function* () {
return new cache_base_1.GradleStateCache(gradleUserHome).save(cacheListener); return new cache_base_1.GradleStateCache(gradleUserHome).save(cacheListener);

File diff suppressed because one or more lines are too long

View file

@ -90,7 +90,11 @@ export async function save(
if (isCacheCleanupEnabled()) { if (isCacheCleanupEnabled()) {
core.info('Forcing cache cleanup.') core.info('Forcing cache cleanup.')
const cacheCleaner = new CacheCleaner(gradleUserHome, process.env['RUNNER_TEMP']!) 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 () => { await core.group('Caching Gradle state', async () => {