actions/setup-java
2
0
Fork 0
mirror of https://github.com/actions/setup-java.git synced 2024-11-23 02:09:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use archive as fallback only when dealing with major version

Browse Source
This commit is contained in:
Nikolai Laevskii 2023-07-18 09:28:12 +02:00
parent ebe05e0f88
commit 33b10b64eb
3 changed files with 79 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
__tests__/distributors/oracle-installer.test.ts
View File

@ -25,7 +25,12 @@ describe('findPackageForDownload', () => {
[ [
'20', '20',
'20', '20',
'https://download.oracle.com/java/20/archive/jdk-20_{{OS_TYPE}}-x64_bin.{{ARCHIVE_TYPE}}' 'https://download.oracle.com/java/20/latest/jdk-20_{{OS_TYPE}}-x64_bin.{{ARCHIVE_TYPE}}'
],
[
'18',
'18',
'https://download.oracle.com/java/18/archive/jdk-18_{{OS_TYPE}}-x64_bin.{{ARCHIVE_TYPE}}'
], ],
[ [
'20.0.1', '20.0.1',
@ -35,7 +40,7 @@ describe('findPackageForDownload', () => {
[ [
'17', '17',
'17', '17',
'https://download.oracle.com/java/17/archive/jdk-17_{{OS_TYPE}}-x64_bin.{{ARCHIVE_TYPE}}' 'https://download.oracle.com/java/17/latest/jdk-17_{{OS_TYPE}}-x64_bin.{{ARCHIVE_TYPE}}'
], ],
[ [
'17.0.1', '17.0.1',
@ -53,6 +58,19 @@ describe('findPackageForDownload', () => {
}) })
); );
/**
* NOTE - Should fail to retrieve 18 from latest and check archive instead
*/
if (input === '18') {
spyHttpClient.mockReturnValueOnce(
Promise.resolve({
message: {
statusCode: 404
}
})
);
}
const result = await distribution['findPackageForDownload'](input); const result = await distribution['findPackageForDownload'](input);
jest.restoreAllMocks(); jest.restoreAllMocks();
@ -75,7 +93,7 @@ describe('findPackageForDownload', () => {
jest.spyOn(os, 'arch').mockReturnValue(osArch); jest.spyOn(os, 'arch').mockReturnValue(osArch);
jest.spyOn(os, 'platform').mockReturnValue('linux'); jest.spyOn(os, 'platform').mockReturnValue('linux');
const version = '17'; const version = '18';
const distro = new OracleDistribution({ const distro = new OracleDistribution({
version, version,
architecture: '', // to get default value architecture: '', // to get default value
@ -89,7 +107,7 @@ describe('findPackageForDownload', () => {
} }
const archiveType = getDownloadArchiveExtension(); const archiveType = getDownloadArchiveExtension();
const result = await distro['findPackageForDownload'](version); const result = await distro['findPackageForDownload'](version);
const expectedUrl = `https://download.oracle.com/java/17/archive/jdk-17_${osType}-${distroArch}_bin.${archiveType}`; const expectedUrl = `https://download.oracle.com/java/18/archive/jdk-18_${osType}-${distroArch}_bin.${archiveType}`;
expect(result.url).toBe(expectedUrl); expect(result.url).toBe(expectedUrl);
} }

32
dist/setup/index.js vendored
View File

@ -102973,19 +102973,33 @@ class OracleDistribution extends base_installer_1.JavaBase {
} }
const platform = this.getPlatform(); const platform = this.getPlatform();
const extension = util_1.getDownloadArchiveExtension(); const extension = util_1.getDownloadArchiveExtension();
const major = range.includes('.') ? range.split('.')[0] : range; const isOnlyMajorProvided = !range.includes('.');
const fileUrl = `${ORACLE_DL_BASE}/${major}/archive/jdk-${range}_${platform}-${arch}_bin.${extension}`; const major = isOnlyMajorProvided ? range : range.split('.')[0];
const possibleUrls = [];
/**
* NOTE
* If only major version was provided we will check it under /latest first
* in order to retrieve the latest possible version if possible,
* otherwise we will fall back to /archive where we are guaranteed to
* find any version if it exists
*/
if (isOnlyMajorProvided) {
possibleUrls.push(`${ORACLE_DL_BASE}/${major}/latest/jdk-${major}_${platform}-${arch}_bin.${extension}`);
}
possibleUrls.push(`${ORACLE_DL_BASE}/${major}/archive/jdk-${range}_${platform}-${arch}_bin.${extension}`);
if (parseInt(major) < 17) { if (parseInt(major) < 17) {
throw new Error('Oracle JDK is only supported for JDK 17 and later'); throw new Error('Oracle JDK is only supported for JDK 17 and later');
} }
const response = yield this.http.head(fileUrl); for (const url of possibleUrls) {
if (response.message.statusCode === http_client_1.HttpCodes.NotFound) { const response = yield this.http.head(url);
throw new Error(`Could not find Oracle JDK for SemVer ${range}`); if (response.message.statusCode === http_client_1.HttpCodes.OK) {
return { url, version: range };
}
if (response.message.statusCode !== http_client_1.HttpCodes.NotFound) {
throw new Error(`Http request for Oracle JDK failed with status code: ${response.message.statusCode}`);
}
} }
if (response.message.statusCode !== http_client_1.HttpCodes.OK) { throw new Error(`Could not find Oracle JDK for SemVer ${range}`);
throw new Error(`Http request for Oracle JDK failed with status code: ${response.message.statusCode}`);
}
return { url: fileUrl, version: range };
}); });
} }
getPlatform(platform = process.platform) { getPlatform(platform = process.platform) {

46
src/distributions/oracle/installer.ts
View File

@ -65,26 +65,48 @@ export class OracleDistribution extends JavaBase {
const platform = this.getPlatform(); const platform = this.getPlatform();
const extension = getDownloadArchiveExtension(); const extension = getDownloadArchiveExtension();
const major = range.includes('.') ? range.split('.')[0] : range;
const fileUrl = `${ORACLE_DL_BASE}/${major}/archive/jdk-${range}_${platform}-${arch}_bin.${extension}`; const isOnlyMajorProvided = !range.includes('.');
const major = isOnlyMajorProvided ? range : range.split('.')[0];
const possibleUrls: string[] = [];
/**
* NOTE
* If only major version was provided we will check it under /latest first
* in order to retrieve the latest possible version if possible,
* otherwise we will fall back to /archive where we are guaranteed to
* find any version if it exists
*/
if (isOnlyMajorProvided) {
possibleUrls.push(
`${ORACLE_DL_BASE}/${major}/latest/jdk-${major}_${platform}-${arch}_bin.${extension}`
);
}
possibleUrls.push(
`${ORACLE_DL_BASE}/${major}/archive/jdk-${range}_${platform}-${arch}_bin.${extension}`
);
if (parseInt(major) < 17) { if (parseInt(major) < 17) {
throw new Error('Oracle JDK is only supported for JDK 17 and later'); throw new Error('Oracle JDK is only supported for JDK 17 and later');
} }
const response = await this.http.head(fileUrl); for (const url of possibleUrls) {
const response = await this.http.head(url);
if (response.message.statusCode === HttpCodes.NotFound) { if (response.message.statusCode === HttpCodes.OK) {
throw new Error(`Could not find Oracle JDK for SemVer ${range}`); return {url, version: range};
}
if (response.message.statusCode !== HttpCodes.NotFound) {
throw new Error(
`Http request for Oracle JDK failed with status code: ${response.message.statusCode}`
);
}
} }
if (response.message.statusCode !== HttpCodes.OK) { throw new Error(`Could not find Oracle JDK for SemVer ${range}`);
throw new Error(
`Http request for Oracle JDK failed with status code: ${response.message.statusCode}`
);
}
return {url: fileUrl, version: range};
} }
public getPlatform(platform: NodeJS.Platform = process.platform): OsVersions { public getPlatform(platform: NodeJS.Platform = process.platform): OsVersions {