From 8236123cabc152ca887cd655a70e6eb44fcd2c4e Mon Sep 17 00:00:00 2001 From: Daz DeBoer Date: Wed, 1 Apr 2026 14:30:14 -0600 Subject: [PATCH] Simplify gradleExecutableForCleanup version selection Use the higher of highestGradleVersion() or MINIMUM_CLEANUP_GRADLE_VERSION. Remove the separate DEFAULT_CLEANUP_GRADLE_VERSION constant. Co-Authored-By: Claude Opus 4.6 (1M context) --- sources/legacy-caching/src/cache-cleaner.ts | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/sources/legacy-caching/src/cache-cleaner.ts b/sources/legacy-caching/src/cache-cleaner.ts index 241c949a..a90a9893 100644 --- a/sources/legacy-caching/src/cache-cleaner.ts +++ b/sources/legacy-caching/src/cache-cleaner.ts @@ -7,7 +7,6 @@ import {BuildResults} from './build-results-adapter' import {versionIsAtLeast, provisionGradleWithVersionAtLeast} from './gradle-utils' const MINIMUM_CLEANUP_GRADLE_VERSION = '8.11' -const DEFAULT_CLEANUP_GRADLE_VERSION = '9.4.1' export class CacheCleaner { private readonly gradleUserHome: string @@ -37,19 +36,12 @@ export class CacheCleaner { * This will avoid the need to provision a Gradle version for the cleanup when not necessary. */ private async gradleExecutableForCleanup(buildResults: BuildResults): Promise { - const preferredVersion = buildResults.highestGradleVersion() - if (preferredVersion && versionIsAtLeast(preferredVersion, MINIMUM_CLEANUP_GRADLE_VERSION)) { - try { - return await provisionGradleWithVersionAtLeast(preferredVersion) - } catch (e) { - core.info( - `Failed to provision Gradle ${preferredVersion} for cache cleanup. Falling back to default version.` - ) - } - } - - // Fallback to the default version for cache-cleanup - return await provisionGradleWithVersionAtLeast(DEFAULT_CLEANUP_GRADLE_VERSION) + const highestVersion = buildResults.highestGradleVersion() + const version = + highestVersion && versionIsAtLeast(highestVersion, MINIMUM_CLEANUP_GRADLE_VERSION) + ? highestVersion + : MINIMUM_CLEANUP_GRADLE_VERSION + return await provisionGradleWithVersionAtLeast(version) } // Visible for testing