diff --git a/__tests__/installer.test.ts b/__tests__/installer.test.ts index ff2d61b5..69efc098 100644 --- a/__tests__/installer.test.ts +++ b/__tests__/installer.test.ts @@ -143,6 +143,20 @@ describe('installer tests', () => { return; }); + it('Uses 1.x version of Java installed in cache', async () => { + const JavaDir: string = path.join(toolDir, 'jdk', '8.0.181', 'x64'); + await io.mkdirP(JavaDir); + fs.writeFileSync(`${JavaDir}.complete`, 'hello'); + // This will throw if it doesn't find it in the cache + await installer.getJava( + '1.8', + 'x64', + 'path shouldnt matter, found in cache', + 'jdk' + ); + return; + }); + it('Doesnt use version of Java that was only partially installed in cache', async () => { const JavaDir: string = path.join(toolDir, 'jdk', '251.0.0', 'x64'); await io.mkdirP(JavaDir); diff --git a/src/installer.ts b/src/installer.ts index cce8fa3d..36781517 100644 --- a/src/installer.ts +++ b/src/installer.ts @@ -32,6 +32,8 @@ export async function getJava( jdkFile: string, javaPackage: string ): Promise { + version = normalizeVersion(version); + let toolPath = tc.find(javaPackage, version); if (toolPath) { @@ -190,7 +192,6 @@ function getDownloadInfo( version: string, javaPackage: string ): {version: string; url: string} { - version = normalizeVersion(version); let extension = ''; if (IS_WINDOWS) { extension = `-win_x64.zip`;