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

working regex

This commit is contained in:
mahabaleshwars 2024-03-04 13:27:16 +05:30
parent a7f2ec4000
commit 12fa539aa2
3 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dist/cleanup/index.js vendored
View File

@ -87889,12 +87889,13 @@ function isCacheFeatureAvailable() {
exports.isCacheFeatureAvailable = isCacheFeatureAvailable;
function getVersionFromFileContent(content, distributionName, versionFile) {
var _a, _b, _c, _d, _e;
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|$)/;
// }
let javaVersionRegExp;
if (versionFile == '.tool-versions') {
javaVersionRegExp = /^java\s+(?:\S+-)?v?(?<version>[^\s]+)$/m;
}
else {
javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
}
const fileContent = ((_b = (_a = content.match(javaVersionRegExp)) === null || _a === void 0 ? void 0 : _a.groups) === null || _b === void 0 ? void 0 : _b.version)
? (_d = (_c = content.match(javaVersionRegExp)) === null || _c === void 0 ? void 0 : _c.groups) === null || _d === void 0 ? void 0 : _d.version
: '';

13
dist/setup/index.js vendored
View File

@ -125263,12 +125263,13 @@ function isCacheFeatureAvailable() {
exports.isCacheFeatureAvailable = isCacheFeatureAvailable;
function getVersionFromFileContent(content, distributionName, versionFile) {
var _a, _b, _c, _d, _e;
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|$)/;
// }
let javaVersionRegExp;
if (versionFile == '.tool-versions') {
javaVersionRegExp = /^java\s+(?:\S+-)?v?(?<version>[^\s]+)$/m;
}
else {
javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
}
const fileContent = ((_b = (_a = content.match(javaVersionRegExp)) === null || _a === void 0 ? void 0 : _a.groups) === null || _b === void 0 ? void 0 : _b.version)
? (_d = (_c = content.match(javaVersionRegExp)) === null || _c === void 0 ? void 0 : _c.groups) === null || _d === void 0 ? void 0 : _d.version
: '';

13
src/util.ts
View File

@ -118,13 +118,12 @@ export function getVersionFromFileContent(
distributionName: string,
versionFile: string
): string | null {
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|$)/;
// }
let javaVersionRegExp: RegExp;
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)