actions
/
setup-java
mirror of https://gitea.com/actions/setup-java.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

patch to extract filename from other directories

This commit is contained in:
mahabaleshwars 2024-03-14 14:46:42 +05:30
parent a847c75719
commit ae77984eef
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dist/cleanup/index.js vendored
View File

@ -88360,11 +88360,11 @@ function getVersionFromFileContent(content, distributionName, versionFile) {
return path.basename(versionFile);
}
const versionFileName = getFileName(versionFile);
if (versionFile == '.tool-versions') {
if (versionFileName == '.tool-versions') {
javaVersionRegExp =
/^(java\s+)(?:\S*-)?v?(?<version>(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m;
}
else if (versionFile == '.java-version') {
else if (versionFileName == '.java-version') {
javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
}
else {

4
dist/setup/index.js vendored
View File

@ -125734,11 +125734,11 @@ function getVersionFromFileContent(content, distributionName, versionFile) {
return path.basename(versionFile);
}
const versionFileName = getFileName(versionFile);
if (versionFile == '.tool-versions') {
if (versionFileName == '.tool-versions') {
javaVersionRegExp =
/^(java\s+)(?:\S*-)?v?(?<version>(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m;
}
else if (versionFile == '.java-version') {
else if (versionFileName == '.java-version') {
javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
}
else {

4
src/util.ts
View File

@ -126,10 +126,10 @@ export function getVersionFromFileContent(
}
const versionFileName = getFileName(versionFile);
if (versionFile == '.tool-versions') {
if (versionFileName == '.tool-versions') {
javaVersionRegExp =
/^(java\s+)(?:\S*-)?v?(?<version>(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m;
} else if (versionFile == '.java-version') {
} else if (versionFileName == '.java-version') {
javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
} else {
throw new Error('Invalid version file');