actions/setup-java
1
0
Fork 0
mirror of https://github.com/actions/setup-java.git synced 2026-07-04 03:15:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge d141a64379 into 67fbd726da

Browse Source
This commit is contained in:
mahabaleshwars 2024-08-28 05:07:55 +00:00 committed by GitHub
commit bd43c4387d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
__tests__/distributors/semeru-installer.test.ts
View File

@ -207,7 +207,7 @@ describe('findPackageForDownload', () => {
}); });
distribution['getAvailableVersions'] = async () => []; distribution['getAvailableVersions'] = async () => [];
await expect(distribution['findPackageForDownload']('8')).rejects.toThrow( 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: ${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.`
); );
} }
); );

14
dist/setup/index.js vendored
View File

@ -124931,7 +124931,8 @@ const supportedArchitectures = [
'ppc64le', 'ppc64le',
'ppc64', 'ppc64',
's390x', 's390x',
'aarch64' 'aarch64',
'arm64'
]; ];
class SemeruDistribution extends base_installer_1.JavaBase { class SemeruDistribution extends base_installer_1.JavaBase {
constructor(installerOptions) { constructor(installerOptions) {
@ -124939,8 +124940,9 @@ class SemeruDistribution extends base_installer_1.JavaBase {
} }
findPackageForDownload(version) { findPackageForDownload(version) {
return __awaiter(this, void 0, void 0, function* () { return __awaiter(this, void 0, void 0, function* () {
if (!supportedArchitectures.includes(this.architecture)) { const arch = this.distributionArchitecture();
throw new Error(`Unsupported architecture for IBM Semeru: ${this.architecture}, the following are supported: ${supportedArchitectures.join(', ')}`); 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.`);
} }
if (!this.stable) { if (!this.stable) {
throw new Error('IBM Semeru does not provide builds for early access versions'); throw new Error('IBM Semeru does not provide builds for early access versions');
@ -124974,7 +124976,7 @@ class SemeruDistribution extends base_installer_1.JavaBase {
const availableOptionsMessage = availableOptions const availableOptionsMessage = availableOptions
? `\nAvailable versions: ${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 '${version}' for your current OS version for ${this.architecture} architecture ${availableOptionsMessage}`);
} }
return resolvedFullVersion; return resolvedFullVersion;
}); });
@ -124999,7 +125001,7 @@ class SemeruDistribution extends base_installer_1.JavaBase {
getAvailableVersions() { getAvailableVersions() {
return __awaiter(this, void 0, void 0, function* () { return __awaiter(this, void 0, void 0, function* () {
const platform = this.getPlatformOption(); const platform = this.getPlatformOption();
const arch = this.architecture; const arch = this.distributionArchitecture();
const imageType = this.packageType; const imageType = this.packageType;
const versionRange = encodeURI('[1.0,100.0]'); // retrieve all available versions const versionRange = encodeURI('[1.0,100.0]'); // retrieve all available versions
const releaseType = this.stable ? 'ga' : 'ea'; const releaseType = this.stable ? 'ga' : 'ea';
@ -127946,4 +127948,4 @@ module.exports = JSON.parse('[[[0,44],"disallowed_STD3_valid"],[[45,46],"valid"]
/******/ module.exports = __webpack_exports__; /******/ module.exports = __webpack_exports__;
/******/ /******/
/******/ })() /******/ })()
; ;

15
src/distributions/semeru/installer.ts
View File

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