diff --git a/__tests__/distributors/graalvm-installer.test.ts b/__tests__/distributors/graalvm-installer.test.ts index bd12d3b4..1ba002e6 100644 --- a/__tests__/distributors/graalvm-installer.test.ts +++ b/__tests__/distributors/graalvm-installer.test.ts @@ -508,7 +508,7 @@ describe('GraalVMDistribution', () => { await expect( (distribution as any).findPackageForDownload('23') ).rejects.toThrow( - "Could not find satisfied version for SemVer '23-ea'" + "No EA build is marked as 'latest' for version range '23-ea'. Available EA versions: 23-ea-20240716." ); // Verify error logging - removed as we now use the helper method which doesn't call core.error @@ -718,7 +718,9 @@ describe('GraalVMDistribution', () => { await expect( (distribution as any).findEABuildDownloadUrl('23-ea') - ).rejects.toThrow("Could not find satisfied version for SemVer '23-ea'"); + ).rejects.toThrow( + "No EA build is marked as 'latest' for version range '23-ea'. Available EA versions: 23-ea-20240716, 23-ea-20240709." + ); // Verify error logging - removed as we now use the helper method which doesn't call core.error }); diff --git a/dist/setup/index.js b/dist/setup/index.js index 0b347822..d87d859a 100644 --- a/dist/setup/index.js +++ b/dist/setup/index.js @@ -112584,7 +112584,7 @@ class JavaBase { const maxVersionsToShow = core.isDebug() ? availableVersions.length : 50; const versionsToShow = availableVersions.slice(0, maxVersionsToShow); const truncated = availableVersions.length > maxVersionsToShow; - parts.push(`Available versions: ${versionsToShow.join(', ')}${truncated ? '...' : ''}`); + parts.push(`Available versions: ${versionsToShow.join(', ')}${truncated ? ', ...' : ''}`); if (truncated) { parts.push(`(showing first ${maxVersionsToShow} of ${availableVersions.length} versions, enable debug mode to see all)`); } @@ -113238,7 +113238,11 @@ class GraalVMDistribution extends base_installer_1.JavaBase { const latestVersion = versions.find(v => v.latest); if (!latestVersion) { const availableVersions = versions.map(v => v.version); - throw this.createVersionNotFoundError(javaEaVersion, availableVersions); + let message = `No EA build is marked as 'latest' for version range '${javaEaVersion}'.`; + if (availableVersions.length > 0) { + message += ` Available EA versions: ${availableVersions.join(', ')}.`; + } + throw new Error(message); } core.debug(`Latest version found: ${latestVersion.version}`); const arch = this.distributionArchitecture(); diff --git a/src/distributions/base-installer.ts b/src/distributions/base-installer.ts index 33f1a6ea..c3eb263a 100644 --- a/src/distributions/base-installer.ts +++ b/src/distributions/base-installer.ts @@ -282,7 +282,7 @@ export abstract class JavaBase { const truncated = availableVersions.length > maxVersionsToShow; parts.push( - `Available versions: ${versionsToShow.join(', ')}${truncated ? '...' : ''}` + `Available versions: ${versionsToShow.join(', ')}${truncated ? ', ...' : ''}` ); if (truncated) { diff --git a/src/distributions/graalvm/installer.ts b/src/distributions/graalvm/installer.ts index c15304df..a92f901f 100644 --- a/src/distributions/graalvm/installer.ts +++ b/src/distributions/graalvm/installer.ts @@ -182,7 +182,11 @@ export class GraalVMDistribution extends JavaBase { const latestVersion = versions.find(v => v.latest); if (!latestVersion) { const availableVersions = versions.map(v => v.version); - throw this.createVersionNotFoundError(javaEaVersion, availableVersions); + let message = `No EA build is marked as 'latest' for version range '${javaEaVersion}'.`; + if (availableVersions.length > 0) { + message += ` Available EA versions: ${availableVersions.join(', ')}.`; + } + throw new Error(message); } core.debug(`Latest version found: ${latestVersion.version}`);