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

Fix

Browse source
This commit is contained in:
Danny McCormick 2019-07-15 14:00:08 -04:00
parent 55f787ebb1
commit 9f0c2dfa0d
2 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/installer.js
View file

@ -49,10 +49,13 @@ function getJava(version, arch, jdkFile) {
else { else {
let compressedFileExtension = ''; let compressedFileExtension = '';
if (!jdkFile) { if (!jdkFile) {
core.debug('Downloading Jdk from Azul');
jdkFile = yield downloadJava(version); jdkFile = yield downloadJava(version);
compressedFileExtension = IS_WINDOWS ? '.zip' : '.tar.gz'; compressedFileExtension = IS_WINDOWS ? '.zip' : '.tar.gz';
} }
core.debug('Retrieving Jdk from local path'); else {
core.debug('Retrieving Jdk from local path');
}
compressedFileExtension = compressedFileExtension || getFileEnding(jdkFile); compressedFileExtension = compressedFileExtension || getFileEnding(jdkFile);
let tempDir = path.join(tempDirectory, 'temp_' + Math.floor(Math.random() * 2000000000)); let tempDir = path.join(tempDirectory, 'temp_' + Math.floor(Math.random() * 2000000000));
const jdkDir = yield unzipJavaDownload(jdkFile, compressedFileExtension, tempDir); const jdkDir = yield unzipJavaDownload(jdkFile, compressedFileExtension, tempDir);

4
src/installer.ts
View file

@ -37,10 +37,12 @@ export async function getJava(
} else { } else {
let compressedFileExtension = ''; let compressedFileExtension = '';
if (!jdkFile) { if (!jdkFile) {
core.debug('Downloading Jdk from Azul');
jdkFile = await downloadJava(version); jdkFile = await downloadJava(version);
compressedFileExtension = IS_WINDOWS ? '.zip' : '.tar.gz'; compressedFileExtension = IS_WINDOWS ? '.zip' : '.tar.gz';
} else {
core.debug('Retrieving Jdk from local path');
} }
core.debug('Retrieving Jdk from local path');
compressedFileExtension = compressedFileExtension || getFileEnding(jdkFile); compressedFileExtension = compressedFileExtension || getFileEnding(jdkFile);
let tempDir: string = path.join( let tempDir: string = path.join(
tempDirectory, tempDirectory,