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

Normalize the version before it is looked up in the tool cache

Browse source 
Currently the resolved version is cached. For example something like 8.0.141.
On other hand when a version is looked up in the cache the string provided
by the user is used. This may lead to unexpected behavior. 1.8 will not match
8.0.141. Normalizing the version string before looking up in the tool cache
will solve the problem. The normalized version (8.x) will match the
entry in the cache as expected.

Normalizing the string in the beginning of the flow won't hurt
as it is a valid version specification. What is more it the user can supply
the normalized version directly so the code should be able to work with it.
This commit is contained in:
Plamen Totev 2020-04-14 21:17:06 +03:00
parent 5c87b70ffe
commit 249ea4386f
2 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

14
__tests__/installer.test.ts
View file

@ -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);

3
src/installer.ts
View file

@ -32,6 +32,8 @@ export async function getJava(
jdkFile: string,
javaPackage: string
): Promise<void> {
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`;