From 207edb9c3f5485359f6645100e00cbb6c25e020b Mon Sep 17 00:00:00 2001
From: mahabaleshwars <147705296+mahabaleshwars@users.noreply.github.com>
Date: Thu, 22 Aug 2024 16:38:14 +0530
Subject: [PATCH 1/9] Updated Error message for Semuru

---
 __tests__/distributors/semeru-installer.test.ts | 2 +-
 dist/setup/index.js                             | 4 ++--
 src/distributions/semeru/installer.ts           | 4 +---
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/__tests__/distributors/semeru-installer.test.ts b/__tests__/distributors/semeru-installer.test.ts
index 97f25cc81..8220660ed 100644
--- a/__tests__/distributors/semeru-installer.test.ts
+++ b/__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}, the following are supported: x64, x86, ppc64le, ppc64, s390x, aarch64`
+        `Unsupported architecture for IBM Semeru: ${arch}, is not supported for IBM Semeru 8 on your current OS version. Please refer to IBM Semeru documentation or support resources to verify compatibility with your OS.`
       );
     }
   );
diff --git a/dist/setup/index.js b/dist/setup/index.js
index be40d6dbd..d57f314b6 100644
--- a/dist/setup/index.js
+++ b/dist/setup/index.js
@@ -124940,7 +124940,7 @@ class SemeruDistribution extends base_installer_1.JavaBase {
     findPackageForDownload(version) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!supportedArchitectures.includes(this.architecture)) {
-                throw new Error(`Unsupported architecture for IBM Semeru: ${this.architecture}, the following are supported: ${supportedArchitectures.join(', ')}`);
+                throw new Error(`Unsupported architecture for IBM Semeru: ${this.architecture}, is not supported for IBM Semeru ${this.version} on 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');
@@ -127946,4 +127946,4 @@ module.exports = JSON.parse('[[[0,44],"disallowed_STD3_valid"],[[45,46],"valid"]
 /******/ 	module.exports = __webpack_exports__;
 /******/ 	
 /******/ })()
-;
+;
\ No newline at end of file
diff --git a/src/distributions/semeru/installer.ts b/src/distributions/semeru/installer.ts
index c40752611..80700b17c 100644
--- a/src/distributions/semeru/installer.ts
+++ b/src/distributions/semeru/installer.ts
@@ -35,9 +35,7 @@ export class SemeruDistribution extends JavaBase {
   ): Promise<JavaDownloadRelease> {
     if (!supportedArchitectures.includes(this.architecture)) {
       throw new Error(
-        `Unsupported architecture for IBM Semeru: ${
-          this.architecture
-        }, the following are supported: ${supportedArchitectures.join(', ')}`
+        `Unsupported architecture for IBM Semeru: ${this.architecture}, is not supported for IBM Semeru ${this.version} on your current OS version. Please refer to IBM Semeru documentation or support resources to verify compatibility with your OS.`
       );
     }
 

From 3c65de9d029a3832c2f9351c483e4404ae18cff0 Mon Sep 17 00:00:00 2001
From: mahabaleshwars <147705296+mahabaleshwars@users.noreply.github.com>
Date: Thu, 22 Aug 2024 17:06:42 +0530
Subject: [PATCH 2/9] Enhanced error message

---
 __tests__/distributors/semeru-installer.test.ts | 2 +-
 dist/setup/index.js                             | 2 +-
 src/distributions/semeru/installer.ts           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/__tests__/distributors/semeru-installer.test.ts b/__tests__/distributors/semeru-installer.test.ts
index 8220660ed..c5e7017e0 100644
--- a/__tests__/distributors/semeru-installer.test.ts
+++ b/__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}, is not supported for IBM Semeru 8 on your current OS version. Please refer to IBM Semeru documentation or support resources to verify compatibility with your OS.`
+        `Unsupported architecture: ${arch} is not supported for IBM Semeru 8 on your current OS version. Please refer to IBM Semeru documentation or support resources to verify compatibility with your OS.`
       );
     }
   );
diff --git a/dist/setup/index.js b/dist/setup/index.js
index d57f314b6..5916ead59 100644
--- a/dist/setup/index.js
+++ b/dist/setup/index.js
@@ -124940,7 +124940,7 @@ class SemeruDistribution extends base_installer_1.JavaBase {
     findPackageForDownload(version) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!supportedArchitectures.includes(this.architecture)) {
-                throw new Error(`Unsupported architecture for IBM Semeru: ${this.architecture}, is not supported for IBM Semeru ${this.version} on your current OS version. Please refer to IBM Semeru documentation or support resources to verify compatibility with your OS.`);
+                throw new Error(`Unsupported architecture: ${this.architecture} is not supported for IBM Semeru ${this.version} on 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');
diff --git a/src/distributions/semeru/installer.ts b/src/distributions/semeru/installer.ts
index 80700b17c..fec1b201a 100644
--- a/src/distributions/semeru/installer.ts
+++ b/src/distributions/semeru/installer.ts
@@ -35,7 +35,7 @@ export class SemeruDistribution extends JavaBase {
   ): Promise<JavaDownloadRelease> {
     if (!supportedArchitectures.includes(this.architecture)) {
       throw new Error(
-        `Unsupported architecture for IBM Semeru: ${this.architecture}, is not supported for IBM Semeru ${this.version} on your current OS version. Please refer to IBM Semeru documentation or support resources to verify compatibility with your OS.`
+        `Unsupported architecture: ${this.architecture} is not supported for IBM Semeru ${this.version} on your current OS version. Please refer to IBM Semeru documentation or support resources to verify compatibility with your OS.`
       );
     }
 

From 6c3405c2ba125ed82cf58019319f67454de0cab6 Mon Sep 17 00:00:00 2001
From: mahabaleshwars <147705296+mahabaleshwars@users.noreply.github.com>
Date: Tue, 27 Aug 2024 16:50:02 +0530
Subject: [PATCH 3/9] Added architecture to semeru

---
 dist/setup/index.js                   | 3 ++-
 src/distributions/semeru/installer.ts | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/dist/setup/index.js b/dist/setup/index.js
index 5916ead59..b62c7db62 100644
--- a/dist/setup/index.js
+++ b/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) {
diff --git a/src/distributions/semeru/installer.ts b/src/distributions/semeru/installer.ts
index fec1b201a..0271150db 100644
--- a/src/distributions/semeru/installer.ts
+++ b/src/distributions/semeru/installer.ts
@@ -22,7 +22,8 @@ const supportedArchitectures = [
   'ppc64le',
   'ppc64',
   's390x',
-  'aarch64'
+  'aarch64',
+  'arm64'
 ];
 
 export class SemeruDistribution extends JavaBase {

From e206e742c51b420ee8571885d9026f2e79a2528d Mon Sep 17 00:00:00 2001
From: mahabaleshwars <147705296+mahabaleshwars@users.noreply.github.com>
Date: Tue, 27 Aug 2024 17:32:48 +0530
Subject: [PATCH 4/9] updated code to provide aarch64 for arm64 architecture
 for semeru

---
 dist/setup/index.js                   | 5 +++--
 src/distributions/semeru/installer.ts | 6 ++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/dist/setup/index.js b/dist/setup/index.js
index b62c7db62..6fc61c52a 100644
--- a/dist/setup/index.js
+++ b/dist/setup/index.js
@@ -124940,7 +124940,8 @@ class SemeruDistribution extends base_installer_1.JavaBase {
     }
     findPackageForDownload(version) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (!supportedArchitectures.includes(this.architecture)) {
+            const arch = this.distributionArchitecture();
+            if (!supportedArchitectures.includes(arch)) {
                 throw new Error(`Unsupported architecture: ${this.architecture} is not supported for IBM Semeru ${this.version} on your current OS version. Please refer to IBM Semeru documentation or support resources to verify compatibility with your OS.`);
             }
             if (!this.stable) {
@@ -125000,7 +125001,7 @@ class SemeruDistribution extends base_installer_1.JavaBase {
     getAvailableVersions() {
         return __awaiter(this, void 0, void 0, function* () {
             const platform = this.getPlatformOption();
-            const arch = this.architecture;
+            const arch = this.distributionArchitecture();
             const imageType = this.packageType;
             const versionRange = encodeURI('[1.0,100.0]'); // retrieve all available versions
             const releaseType = this.stable ? 'ga' : 'ea';
diff --git a/src/distributions/semeru/installer.ts b/src/distributions/semeru/installer.ts
index 0271150db..8bcc067a9 100644
--- a/src/distributions/semeru/installer.ts
+++ b/src/distributions/semeru/installer.ts
@@ -34,7 +34,9 @@ export class SemeruDistribution extends JavaBase {
   protected async findPackageForDownload(
     version: string
   ): Promise<JavaDownloadRelease> {
-    if (!supportedArchitectures.includes(this.architecture)) {
+    const arch = this.distributionArchitecture();
+
+    if (!supportedArchitectures.includes(arch)) {
       throw new Error(
         `Unsupported architecture: ${this.architecture} is not supported for IBM Semeru ${this.version} on your current OS version. Please refer to IBM Semeru documentation or support resources to verify compatibility with your OS.`
       );
@@ -123,7 +125,7 @@ export class SemeruDistribution extends JavaBase {
 
   public async getAvailableVersions(): Promise<ISemeruAvailableVersions[]> {
     const platform = this.getPlatformOption();
-    const arch = this.architecture;
+    const arch = this.distributionArchitecture();
     const imageType = this.packageType;
     const versionRange = encodeURI('[1.0,100.0]'); // retrieve all available versions
     const releaseType = this.stable ? 'ga' : 'ea';

From 7a9787ff5668adfc3cc1371830a5748f5bec9c09 Mon Sep 17 00:00:00 2001
From: mahabaleshwars <147705296+mahabaleshwars@users.noreply.github.com>
Date: Wed, 28 Aug 2024 10:14:02 +0530
Subject: [PATCH 5/9] updated semver message

---
 dist/setup/index.js                   | 2 +-
 src/distributions/semeru/installer.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dist/setup/index.js b/dist/setup/index.js
index 6fc61c52a..9bcc0b836 100644
--- a/dist/setup/index.js
+++ b/dist/setup/index.js
@@ -124976,7 +124976,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}'. ${availableOptionsMessage}`);
+                throw new Error(`Could not find satisfied version for SemVer '${version}'. on your current OS version for ${arch}  ${availableOptionsMessage}`);
             }
             return resolvedFullVersion;
         });
diff --git a/src/distributions/semeru/installer.ts b/src/distributions/semeru/installer.ts
index 8bcc067a9..388ecfc95 100644
--- a/src/distributions/semeru/installer.ts
+++ b/src/distributions/semeru/installer.ts
@@ -82,7 +82,7 @@ export class SemeruDistribution extends JavaBase {
         ? `\nAvailable versions: ${availableOptions}`
         : '';
       throw new Error(
-        `Could not find satisfied version for SemVer '${version}'. ${availableOptionsMessage}`
+        `Could not find satisfied version for SemVer '${version}'. on your current OS version for ${arch}  ${availableOptionsMessage}`
       );
     }
 

From ae113ef7238d09ed6ca85df25ed97b2912853f2e Mon Sep 17 00:00:00 2001
From: mahabaleshwars <147705296+mahabaleshwars@users.noreply.github.com>
Date: Wed, 28 Aug 2024 10:16:07 +0530
Subject: [PATCH 6/9] updated semver error message

---
 src/distributions/semeru/installer.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/distributions/semeru/installer.ts b/src/distributions/semeru/installer.ts
index 388ecfc95..3443b94a7 100644
--- a/src/distributions/semeru/installer.ts
+++ b/src/distributions/semeru/installer.ts
@@ -82,7 +82,7 @@ export class SemeruDistribution extends JavaBase {
         ? `\nAvailable versions: ${availableOptions}`
         : '';
       throw new Error(
-        `Could not find satisfied version for SemVer '${version}'. on your current OS version for ${arch}  ${availableOptionsMessage}`
+        `Could not find satisfied version for SemVer '${version}'. on your current OS version for ${this.architecture} ${availableOptionsMessage}`
       );
     }
 

From 7c6fe208f4b3781ab5bf66ae85833a6a76049eff Mon Sep 17 00:00:00 2001
From: mahabaleshwars <147705296+mahabaleshwars@users.noreply.github.com>
Date: Wed, 28 Aug 2024 10:19:16 +0530
Subject: [PATCH 7/9] Enhanced the error message for semeru

---
 dist/setup/index.js                   | 2 +-
 src/distributions/semeru/installer.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dist/setup/index.js b/dist/setup/index.js
index 9bcc0b836..eac081e7d 100644
--- a/dist/setup/index.js
+++ b/dist/setup/index.js
@@ -124976,7 +124976,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}'. on your current OS version for ${arch}  ${availableOptionsMessage}`);
+                throw new Error(`Could not find satisfied version for SemVer '${version}' on your current OS version for ${this.architecture} ${availableOptionsMessage}`);
             }
             return resolvedFullVersion;
         });
diff --git a/src/distributions/semeru/installer.ts b/src/distributions/semeru/installer.ts
index 3443b94a7..c39242bb0 100644
--- a/src/distributions/semeru/installer.ts
+++ b/src/distributions/semeru/installer.ts
@@ -82,7 +82,7 @@ export class SemeruDistribution extends JavaBase {
         ? `\nAvailable versions: ${availableOptions}`
         : '';
       throw new Error(
-        `Could not find satisfied version for SemVer '${version}'. on your current OS version for ${this.architecture} ${availableOptionsMessage}`
+        `Could not find satisfied version for SemVer '${version}' on your current OS version for ${this.architecture} ${availableOptionsMessage}`
       );
     }
 

From d141a64379a031a7fa20cdbd93ef790d2c466dfa Mon Sep 17 00:00:00 2001
From: mahabaleshwars <147705296+mahabaleshwars@users.noreply.github.com>
Date: Wed, 28 Aug 2024 10:25:12 +0530
Subject: [PATCH 8/9] Enhanced error messaged for semeru distribution

---
 __tests__/distributors/semeru-installer.test.ts | 2 +-
 dist/setup/index.js                             | 4 ++--
 src/distributions/semeru/installer.ts           | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/__tests__/distributors/semeru-installer.test.ts b/__tests__/distributors/semeru-installer.test.ts
index c5e7017e0..868e06d07 100644
--- a/__tests__/distributors/semeru-installer.test.ts
+++ b/__tests__/distributors/semeru-installer.test.ts
@@ -207,7 +207,7 @@ describe('findPackageForDownload', () => {
       });
       distribution['getAvailableVersions'] = async () => [];
       await expect(distribution['findPackageForDownload']('8')).rejects.toThrow(
-        `Unsupported architecture: ${arch} is not supported for IBM Semeru 8 on your current OS version. Please refer to IBM Semeru documentation or support resources to verify compatibility with your OS.`
+        `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.`
       );
     }
   );
diff --git a/dist/setup/index.js b/dist/setup/index.js
index eac081e7d..cfb9dfae3 100644
--- a/dist/setup/index.js
+++ b/dist/setup/index.js
@@ -124942,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: ${this.architecture} is not supported for IBM Semeru ${this.version} on your current OS version. Please refer to IBM Semeru documentation or support resources to verify compatibility with your OS.`);
+                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');
@@ -124976,7 +124976,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}' on your current OS version for ${this.architecture} ${availableOptionsMessage}`);
+                throw new Error(`Could not find satisfied version for SemVer version '${version}' for your current OS version for ${this.architecture} architecture ${availableOptionsMessage}`);
             }
             return resolvedFullVersion;
         });
diff --git a/src/distributions/semeru/installer.ts b/src/distributions/semeru/installer.ts
index c39242bb0..9beea71e2 100644
--- a/src/distributions/semeru/installer.ts
+++ b/src/distributions/semeru/installer.ts
@@ -38,7 +38,7 @@ export class SemeruDistribution extends JavaBase {
 
     if (!supportedArchitectures.includes(arch)) {
       throw new Error(
-        `Unsupported architecture: ${this.architecture} is not supported for IBM Semeru ${this.version} on your current OS version. Please refer to IBM Semeru documentation or support resources to verify compatibility with your OS.`
+        `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.`
       );
     }
 
@@ -82,7 +82,7 @@ export class SemeruDistribution extends JavaBase {
         ? `\nAvailable versions: ${availableOptions}`
         : '';
       throw new Error(
-        `Could not find satisfied version for SemVer '${version}' on your current OS version for ${this.architecture} ${availableOptionsMessage}`
+        `Could not find satisfied version for SemVer version '${version}' for your current OS version for ${this.architecture} architecture ${availableOptionsMessage}`
       );
     }
 

From bd480edf49aca7cc21af751d301933d3d9b9b58b Mon Sep 17 00:00:00 2001
From: mahabaleshwars <147705296+mahabaleshwars@users.noreply.github.com>
Date: Thu, 29 Aug 2024 10:24:09 +0530
Subject: [PATCH 9/9] enhanced error message for semeru

---
 __tests__/distributors/semeru-installer.test.ts | 2 +-
 dist/setup/index.js                             | 5 ++---
 src/distributions/semeru/installer.ts           | 9 ++++++---
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/__tests__/distributors/semeru-installer.test.ts b/__tests__/distributors/semeru-installer.test.ts
index 868e06d07..690478f79 100644
--- a/__tests__/distributors/semeru-installer.test.ts
+++ b/__tests__/distributors/semeru-installer.test.ts
@@ -207,7 +207,7 @@ describe('findPackageForDownload', () => {
       });
       distribution['getAvailableVersions'] = async () => [];
       await expect(distribution['findPackageForDownload']('8')).rejects.toThrow(
-        `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.`
+        `Unsupported architecture for IBM Semeru: ${arch} for your current OS version, the following are supported: x64, x86, ppc64le, ppc64, s390x, aarch64`
       );
     }
   );
diff --git a/dist/setup/index.js b/dist/setup/index.js
index cfb9dfae3..878191fbe 100644
--- a/dist/setup/index.js
+++ b/dist/setup/index.js
@@ -124931,8 +124931,7 @@ const supportedArchitectures = [
     'ppc64le',
     'ppc64',
     's390x',
-    'aarch64',
-    'arm64'
+    'aarch64'
 ];
 class SemeruDistribution extends base_installer_1.JavaBase {
     constructor(installerOptions) {
@@ -124942,7 +124941,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: ${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.`);
+                throw new Error(`Unsupported architecture for IBM Semeru: ${this.architecture} for your current OS version, the following are supported: ${supportedArchitectures.join(', ')}`);
             }
             if (!this.stable) {
                 throw new Error('IBM Semeru does not provide builds for early access versions');
diff --git a/src/distributions/semeru/installer.ts b/src/distributions/semeru/installer.ts
index 9beea71e2..5e3e2fafc 100644
--- a/src/distributions/semeru/installer.ts
+++ b/src/distributions/semeru/installer.ts
@@ -22,8 +22,7 @@ const supportedArchitectures = [
   'ppc64le',
   'ppc64',
   's390x',
-  'aarch64',
-  'arm64'
+  'aarch64'
 ];
 
 export class SemeruDistribution extends JavaBase {
@@ -38,7 +37,11 @@ export class SemeruDistribution extends JavaBase {
 
     if (!supportedArchitectures.includes(arch)) {
       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.`
+        `Unsupported architecture for IBM Semeru: ${
+          this.architecture
+        } for your current OS version, the following are supported: ${supportedArchitectures.join(
+          ', '
+        )}`
       );
     }