mirror of
https://github.com/actions/setup-java.git
synced 2025-04-20 01:46:46 +00:00
testing with one regex
This commit is contained in:
parent
7abdf1c01e
commit
a7f2ec4000
3 changed files with 19 additions and 20 deletions
13
src/util.ts
13
src/util.ts
|
@ -118,12 +118,13 @@ export function getVersionFromFileContent(
|
|||
distributionName: string,
|
||||
versionFile: string
|
||||
): string | null {
|
||||
let javaVersionRegExp: RegExp;
|
||||
if (versionFile == '.tool-versions') {
|
||||
javaVersionRegExp = /^java\s+(?:\S+-)?v?(?<version>[^\s]+)$/m;
|
||||
} else {
|
||||
javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
|
||||
}
|
||||
const javaVersionRegExp = /^java\s+(?:\S+-)?v?(?<version>[^\s]+)$/m;
|
||||
|
||||
// if (versionFile == '.tool-versions') {
|
||||
// javaVersionRegExp = /^java\s+(?:\S+-)?v?(?<version>[^\s]+)$/m;
|
||||
// } else {
|
||||
// javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
|
||||
// }
|
||||
|
||||
const fileContent = content.match(javaVersionRegExp)?.groups?.version
|
||||
? (content.match(javaVersionRegExp)?.groups?.version as string)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue