actions/setup-java
1
0 Fork 0
mirror of https://github.com/actions/setup-java.git synced 2026-10-06 09:24:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Patch for java version file (#610)

Browse Source 
* patch to extract file from other location

* patch to extract filename from other directories

* removed code failing checks

* changed the validation for .java-version type
This commit is contained in:
mahabaleshwars authored and GitHub committed 2024-03-14 09:12:58 -05:00
1 parent 5896cecc08
commit 99b8673ff6
3 files changed
+20 -14
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/util.ts
+8 -4
View File
@@ -119,13 +119,17 @@ export function getVersionFromFileContent(
versionFile: string
): string | null {
let javaVersionRegExp: RegExp;
if (versionFile == '.tool-versions') {
function getFileName(versionFile: string) {
return path.basename(versionFile);
}
const versionFileName = getFileName(versionFile);
if (versionFileName == '.tool-versions') {
javaVersionRegExp =
/^(java\s+)(?:\S*-)?v?(?<version>(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m;
} else if (versionFile == '.java-version') {
javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
} else {
throw new Error('Invalid version file');
javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
}
const fileContent = content.match(javaVersionRegExp)?.groups?.version