actions/setup-java
2
0
Fork 0
mirror of https://github.com/actions/setup-java.git synced 2025-04-20 01:46:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix pathing

Browse source
This commit is contained in:
Danny McCormick 2019-07-15 13:48:23 -04:00
parent d04dab381d
commit 1d110a99d1
2 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/installer.js
View file

@ -48,8 +48,7 @@ function getJava(version, arch, jdkFile) {
} }
else { else {
if (!jdkFile) { if (!jdkFile) {
const downloadUrl = yield getDownloadUrl(version); jdkFile = yield downloadJava(version);
jdkFile = yield tc.downloadTool(downloadUrl);
} }
core.debug('Retrieving Jdk from local path'); core.debug('Retrieving Jdk from local path');
const compressedFileExtension = getFileEnding(jdkFile); const compressedFileExtension = getFileEnding(jdkFile);
@ -145,7 +144,7 @@ function unzipJavaDownload(repoRoot, fileEnding, destinationFolder) {
} }
}); });
} }
function getDownloadUrl(version) { function downloadJava(version) {
return __awaiter(this, void 0, void 0, function* () { return __awaiter(this, void 0, void 0, function* () {
let filterString = ''; let filterString = '';
if (IS_WINDOWS) { if (IS_WINDOWS) {
@ -170,7 +169,8 @@ function getDownloadUrl(version) {
if (refs.length == 0) { if (refs.length == 0) {
throw new Error(`No valid download found for version ${version}. Check https://static.azul.com/zulu/bin/ for a list of valid versions or download your own jdk file and add the jdkFile argument`); throw new Error(`No valid download found for version ${version}. Check https://static.azul.com/zulu/bin/ for a list of valid versions or download your own jdk file and add the jdkFile argument`);
} }
const downloadLocation = refs[0].slice('<a href="'.length, refs[0].length - '">'.length); const fileName = refs[0].slice('<a href="'.length, refs[0].length - '">'.length);
return `https://static.azul.com/zulu/bin/${downloadLocation}`; const dest = yield tc.downloadTool(`https://static.azul.com/zulu/bin/${fileName}`);
return path.join(dest, fileName);
}); });
} }

12
src/installer.ts
View file

@ -36,8 +36,7 @@ export async function getJava(
core.debug(`Tool found in cache ${toolPath}`); core.debug(`Tool found in cache ${toolPath}`);
} else { } else {
if (!jdkFile) { if (!jdkFile) {
const downloadUrl: string = await getDownloadUrl(version); jdkFile = await downloadJava(version);
jdkFile = await tc.downloadTool(downloadUrl);
} }
core.debug('Retrieving Jdk from local path'); core.debug('Retrieving Jdk from local path');
const compressedFileExtension = getFileEnding(jdkFile); const compressedFileExtension = getFileEnding(jdkFile);
@ -144,7 +143,7 @@ async function unzipJavaDownload(
} }
} }
async function getDownloadUrl(version: string) { async function downloadJava(version: string): Promise<string> {
let filterString = ''; let filterString = '';
if (IS_WINDOWS) { if (IS_WINDOWS) {
filterString = `jdk${version}-win_x64.zip`; filterString = `jdk${version}-win_x64.zip`;
@ -172,9 +171,12 @@ async function getDownloadUrl(version: string) {
); );
} }
const downloadLocation = refs[0].slice( const fileName = refs[0].slice(
'<a href="'.length, '<a href="'.length,
refs[0].length - '">'.length refs[0].length - '">'.length
); );
return `https://static.azul.com/zulu/bin/${downloadLocation}`; const dest = await tc.downloadTool(
`https://static.azul.com/zulu/bin/${fileName}`
);
return path.join(dest, fileName);
} }