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 filter logic

Browse source
This commit is contained in:
Maxim Lobanov 2021-03-19 12:07:40 +03:00
parent b5490195d1
commit 4d83f46b4c
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
dist/setup/index.js vendored
View file

@ -14083,11 +14083,14 @@ class ZuluDistribution extends base_installer_1.JavaBase {
return mainVersion;
}
findJDKInstallationSubfolder(archiveFolder) {
// Zulu archive contains a bunch of symlinks and zulu-<major_version>.jdk subfolder
if (process.platform != 'darwin') {
return archiveFolder;
}
// Zulu archive on macOS contains a set of symlinks and zulu-<major_version>.jdk subfolder
const jdkFolders = fs_1.default
.readdirSync(archiveFolder, { withFileTypes: true })
.filter(item => !item.isSymbolicLink())
.filter(item => item.name.startsWith('zulu-') && item.name.endsWith('.jdk'));
.filter(item => item.isDirectory() && !item.isSymbolicLink())
.filter(item => /^zulu-\d+\.\w+$/.test(item.name));
if (jdkFolders.length === 0) {
return archiveFolder;
}

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

@ -171,7 +171,7 @@ export class ZuluDistribution extends JavaBase {
// Zulu archive on macOS contains a set of symlinks and zulu-<major_version>.jdk subfolder
const jdkFolders = fs
.readdirSync(archiveFolder, { withFileTypes: true })
.filter(item => item.isDirectory() && !item.isSymbolicLink() )
.filter(item => item.isDirectory() && !item.isSymbolicLink())
.filter(item => /^zulu-\d+\.\w+$/.test(item.name));
if (jdkFolders.length === 0) {
return archiveFolder;