Merge d3af3ec854 into 6a0805fcef

__tests__/distributors/semeru-installer.test.ts

@@ -207,7 +207,7 @@ describe('findPackageForDownload', () => {
       });
       distribution['getAvailableVersions'] = async () => [];
       await expect(distribution['findPackageForDownload']('8')).rejects.toThrow(
-        `Unsupported architecture for IBM Semeru: ${arch} for your current OS version, the following are supported: x64, x86, ppc64le, ppc64, s390x, aarch64`
+        `Unsupported architecture for IBM Semeru: ${arch}, the following are supported: x64, x86, ppc64le, ppc64, s390x, aarch64`
       );
     }
   );

dist/setup/index.js

@@ -123961,7 +123961,7 @@ class CorrettoDistribution extends base_installer_1.JavaBase {
             const arch = this.distributionArchitecture();
             const imageType = this.packageType;
             if (core.isDebug()) {
-                console.time('Retrieving available versions for Corretto took'); // eslint-disable-line no-console
+                console.time('Retrieving available versions for Coretto took'); // eslint-disable-line no-console
             }
             const availableVersionsUrl = 'https://corretto.github.io/corretto-downloads/latest_links/indexmap_with_checksum.json';
             const fetchCurrentVersions = yield this.http.getJson(availableVersionsUrl);
@@ -123973,7 +123973,7 @@ class CorrettoDistribution extends base_installer_1.JavaBase {
             const availableVersions = this.getAvailableVersionsForPlatform(eligibleVersions);
             if (core.isDebug()) {
                 core.startGroup('Print information about available versions');
-                console.timeEnd('Retrieving available versions for Corretto took'); // eslint-disable-line no-console
+                console.timeEnd('Retrieving available versions for Coretto took'); // eslint-disable-line no-console
                 core.debug(`Available versions: [${availableVersions.length}]`);
                 core.debug(availableVersions
                     .map(item => `${item.version}: ${item.correttoVersion}`)
@@ -124939,9 +124939,8 @@ class SemeruDistribution extends base_installer_1.JavaBase {
     }
     findPackageForDownload(version) {
         return __awaiter(this, void 0, void 0, function* () {
-            const arch = this.distributionArchitecture();
-            if (!supportedArchitectures.includes(arch)) {
-                throw new Error(`Unsupported architecture for IBM Semeru: ${this.architecture} for your current OS version, the following are supported: ${supportedArchitectures.join(', ')}`);
+            if (!supportedArchitectures.includes(this.architecture)) {
+                throw new Error(`Unsupported architecture for IBM Semeru: ${this.architecture}, the following are supported: ${supportedArchitectures.join(', ')}`);
             }
             if (!this.stable) {
                 throw new Error('IBM Semeru does not provide builds for early access versions');
@@ -124975,7 +124974,7 @@ class SemeruDistribution extends base_installer_1.JavaBase {
                 const availableOptionsMessage = availableOptions
                     ? `\nAvailable versions: ${availableOptions}`
                     : '';
-                throw new Error(`Could not find satisfied version for SemVer version '${version}' for your current OS version for ${this.architecture} architecture ${availableOptionsMessage}`);
+                throw new Error(`Could not find satisfied version for SemVer '${version}'. ${availableOptionsMessage}`);
             }
             return resolvedFullVersion;
         });
@@ -125000,7 +124999,7 @@ class SemeruDistribution extends base_installer_1.JavaBase {
     getAvailableVersions() {
         return __awaiter(this, void 0, void 0, function* () {
             const platform = this.getPlatformOption();
-            const arch = this.distributionArchitecture();
+            const arch = this.architecture;
             const imageType = this.packageType;
             const versionRange = encodeURI('[1.0,100.0]'); // retrieve all available versions
             const releaseType = this.stable ? 'ga' : 'ea';

src/distributions/corretto/installer.ts

@@ -93,7 +93,7 @@ export class CorrettoDistribution extends JavaBase {
     const imageType = this.packageType;
 
     if (core.isDebug()) {
-      console.time('Retrieving available versions for Corretto took'); // eslint-disable-line no-console
+      console.time('Retrieving available versions for Coretto took'); // eslint-disable-line no-console
     }
 
     const availableVersionsUrl =
@@ -116,7 +116,7 @@ export class CorrettoDistribution extends JavaBase {
 
     if (core.isDebug()) {
       core.startGroup('Print information about available versions');
-      console.timeEnd('Retrieving available versions for Corretto took'); // eslint-disable-line no-console
+      console.timeEnd('Retrieving available versions for Coretto took'); // eslint-disable-line no-console
       core.debug(`Available versions: [${availableVersions.length}]`);
       core.debug(
         availableVersions

src/distributions/semeru/installer.ts

@@ -33,15 +33,11 @@ export class SemeruDistribution extends JavaBase {
   protected async findPackageForDownload(
     version: string
   ): Promise<JavaDownloadRelease> {
-    const arch = this.distributionArchitecture();
-
-    if (!supportedArchitectures.includes(arch)) {
+    if (!supportedArchitectures.includes(this.architecture)) {
       throw new Error(
         `Unsupported architecture for IBM Semeru: ${
           this.architecture
-        } for your current OS version, the following are supported: ${supportedArchitectures.join(
-          ', '
-        )}`
+        }, the following are supported: ${supportedArchitectures.join(', ')}`
       );
     }
 
@@ -85,7 +81,7 @@ export class SemeruDistribution extends JavaBase {
         ? `\nAvailable versions: ${availableOptions}`
         : '';
       throw new Error(
-        `Could not find satisfied version for SemVer version '${version}' for your current OS version for ${this.architecture} architecture ${availableOptionsMessage}`
+        `Could not find satisfied version for SemVer '${version}'. ${availableOptionsMessage}`
       );
     }
 
@@ -128,7 +124,7 @@ export class SemeruDistribution extends JavaBase {
 
   public async getAvailableVersions(): Promise<ISemeruAvailableVersions[]> {
     const platform = this.getPlatformOption();
-    const arch = this.distributionArchitecture();
+    const arch = this.architecture;
     const imageType = this.packageType;
     const versionRange = encodeURI('[1.0,100.0]'); // retrieve all available versions
     const releaseType = this.stable ? 'ga' : 'ea';