actions/setup-java
1
0
Fork 0
mirror of https://github.com/actions/setup-java.git synced 2025-07-23 06:58:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

implement fix

Browse source
This commit is contained in:
Maxim Lobanov 2021-03-19 11:10:28 +03:00
parent 2af39a78a7
commit b082205a41
4 changed files with 44 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/distributions/zulu/installer.ts
View file

@ -72,8 +72,10 @@ export class ZuluDistribution extends JavaBase {
const archiveName = fs.readdirSync(extractedJavaPath)[0];
const archivePath = path.join(extractedJavaPath, archiveName);
const jdkPath = this.findJDKInstallationSubfolder(archivePath);
const javaPath = await tc.cacheDir(
archivePath,
jdkPath,
this.toolcacheFolderName,
this.getToolcacheVersionName(javaRelease.version),
this.architecture
@ -160,4 +162,17 @@ export class ZuluDistribution extends JavaBase {
return mainVersion;
}
private findJDKInstallationSubfolder(archiveFolder: string) {
// Zulu archive contains a bunch of symlinks and zulu-<major_version>.jdk subfolder
const jdkFolders = fs
.readdirSync(archiveFolder, { withFileTypes: true })
.filter(item => !item.isSymbolicLink())
.filter(item => item.name.startsWith('zulu-') && item.name.endsWith('.jdk'));
if (jdkFolders.length === 0) {
return archiveFolder;
}
return path.join(archiveFolder, jdkFolders[0].name);
}
}