diff --git a/lib/installer.js b/lib/installer.js index 91f9ed1..1c5c8c5 100644 --- a/lib/installer.js +++ b/lib/installer.js @@ -39,9 +39,9 @@ if (!tempDirectory) { } tempDirectory = path.join(baseLocation, 'actions', 'temp'); } -function getJava(versionSpec, arch, jdkFile) { +function getJava(version, arch, jdkFile) { return __awaiter(this, void 0, void 0, function* () { - let toolPath = tc.find('Java', versionSpec); + let toolPath = tc.find('Java', version); if (toolPath) { core.debug(`Tool found in cache ${toolPath}`); } @@ -51,9 +51,9 @@ function getJava(versionSpec, arch, jdkFile) { let tempDir = path.join(tempDirectory, 'temp_' + Math.floor(Math.random() * 2000000000)); const jdkDir = yield unzipJavaDownload(jdkFile, compressedFileExtension, tempDir); core.debug(`jdk extracted to ${jdkDir}`); - toolPath = yield tc.cacheDir(jdkDir, 'Java', versionSpec, arch); + toolPath = yield tc.cacheDir(jdkDir, 'Java', `${version}.0.0`, arch); } - let extendedJavaHome = 'JAVA_HOME_' + versionSpec + '_' + arch; + let extendedJavaHome = 'JAVA_HOME_' + version + '_' + arch; core.exportVariable('JAVA_HOME', toolPath); core.exportVariable(extendedJavaHome, toolPath); core.addPath(path.join(toolPath, 'bin')); diff --git a/src/installer.ts b/src/installer.ts index b5d4fe3..dbd114b 100644 --- a/src/installer.ts +++ b/src/installer.ts @@ -25,11 +25,11 @@ if (!tempDirectory) { } export async function getJava( - versionSpec: string, + version: string, arch: string, jdkFile: string ): Promise { - let toolPath = tc.find('Java', versionSpec); + let toolPath = tc.find('Java', version); if (toolPath) { core.debug(`Tool found in cache ${toolPath}`); @@ -46,10 +46,10 @@ export async function getJava( tempDir ); core.debug(`jdk extracted to ${jdkDir}`); - toolPath = await tc.cacheDir(jdkDir, 'Java', versionSpec, arch); + toolPath = await tc.cacheDir(jdkDir, 'Java', `${version}.0.0`, arch); } - let extendedJavaHome = 'JAVA_HOME_' + versionSpec + '_' + arch; + let extendedJavaHome = 'JAVA_HOME_' + version + '_' + arch; core.exportVariable('JAVA_HOME', toolPath); core.exportVariable(extendedJavaHome, toolPath); core.addPath(path.join(toolPath, 'bin'));