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

patch to extract filename from other directories

Browse source
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
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); return path.basename(versionFile);
} }
const versionFileName = getFileName(versionFile); const versionFileName = getFileName(versionFile);
if (versionFile == '.tool-versions') { if (versionFileName == '.tool-versions') {
javaVersionRegExp = javaVersionRegExp =
/^(java\s+)(?:\S*-)?v?(?<version>(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m; /^(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|$)/; javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
} }
else { else {

4
dist/setup/index.js vendored
View file

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

4
src/util.ts
View file

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