Merge 96e5c4f511 into 1d018f9b8b

__tests__/distributors/graalvm-installer.test.ts

@@ -508,7 +508,7 @@ describe('GraalVMDistribution', () => {
         await expect(
           (distribution as any).findPackageForDownload('23')
         ).rejects.toThrow(
-          "No EA build is marked as 'latest' for version range '23-ea'. Available EA versions: 23-ea-20240716."
+          "Could not find satisfied version for SemVer '23-ea'"
         );
 
         // Verify error logging - removed as we now use the helper method which doesn't call core.error
@@ -718,9 +718,7 @@ describe('GraalVMDistribution', () => {
 
       await expect(
         (distribution as any).findEABuildDownloadUrl('23-ea')
-      ).rejects.toThrow(
+      ).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, 23-ea-20240709."
-      );
 
       // Verify error logging - removed as we now use the helper method which doesn't call core.error
     });

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,11 +113238,7 @@ class GraalVMDistribution extends base_installer_1.JavaBase {
             const latestVersion = versions.find(v => v.latest);
             if (!latestVersion) {
                 const availableVersions = versions.map(v => v.version);
-                let message = `No EA build is marked as 'latest' for version range '${javaEaVersion}'.`;
+                throw this.createVersionNotFoundError(javaEaVersion, availableVersions);
-                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();

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) {

src/distributions/graalvm/installer.ts

@@ -182,11 +182,7 @@ export class GraalVMDistribution extends JavaBase {
     const latestVersion = versions.find(v => v.latest);
     if (!latestVersion) {
       const availableVersions = versions.map(v => v.version);
-      let message = `No EA build is marked as 'latest' for version range '${javaEaVersion}'.`;
+      throw this.createVersionNotFoundError(javaEaVersion, availableVersions);
-      if (availableVersions.length > 0) {
-        message += ` Available EA versions: ${availableVersions.join(', ')}.`;
-      }
-      throw new Error(message);
     }
 
     core.debug(`Latest version found: ${latestVersion.version}`);