Merge d141a64379 into 67fbd726da

__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: ${arch} is not supported for IBM Semeru 8 for your current OS version. Please refer to IBM Semeru documentation or support resources to verify compatibility with your OS.`
       );
     }
   );

dist/setup/index.js

@@ -124931,7 +124931,8 @@ const supportedArchitectures = [
     'ppc64le',
     'ppc64',
     's390x',
-    'aarch64'
+    'aarch64',
+    'arm64'
 ];
 class SemeruDistribution extends base_installer_1.JavaBase {
     constructor(installerOptions) {
@@ -124941,7 +124942,7 @@ class SemeruDistribution extends base_installer_1.JavaBase {
         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(', ')}`);
+                throw new Error(`Unsupported architecture: ${this.architecture} is not supported for IBM Semeru ${this.version} for your current OS version. Please refer to IBM Semeru documentation or support resources to verify compatibility with your OS.`);
             }
             if (!this.stable) {
                 throw new Error('IBM Semeru does not provide builds for early access versions');

src/distributions/semeru/installer.ts

@@ -22,7 +22,8 @@ const supportedArchitectures = [
   'ppc64le',
   'ppc64',
   's390x',
-  'aarch64'
+  'aarch64',
+  'arm64'
 ];
 
 export class SemeruDistribution extends JavaBase {
@@ -37,11 +38,7 @@ export class SemeruDistribution extends JavaBase {
 
     if (!supportedArchitectures.includes(arch)) {
       throw new Error(
-        `Unsupported architecture for IBM Semeru: ${
+        `Unsupported architecture: ${this.architecture} is not supported for IBM Semeru ${this.version} for your current OS version. Please refer to IBM Semeru documentation or support resources to verify compatibility with your OS.`
-          this.architecture
-        } for your current OS version, the following are supported: ${supportedArchitectures.join(
-          ', '
-        )}`
       );
     }