Skip to content

Patch for java version file #610

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
v-HarithaVattikuti merged 4 commits into from
Mar 14, 2024
Merged

Patch for java version file #610

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a847c75
patch to extract file from other location
v-mahabaleshwars Mar 14, 2024
ae77984
patch to extract filename from other directories
v-mahabaleshwars Mar 14, 2024
0b8af76
removed code failing checks
v-mahabaleshwars Mar 14, 2024
d265fde
changed the validation for .java-version type
v-mahabaleshwars Mar 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
patch to extract filename from other directories
  • Loading branch information
@v-mahabaleshwars
v-mahabaleshwars committed Mar 14, 2024
commit ae77984eef13e4fc9cd5c09b2c89857db0a2a7c1
4 changes: 2 additions & 2 deletions dist/cleanup/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions dist/setup/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions src/util.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down