parseversion

This commit is contained in:
Evgenii Korolevskii 2022-11-24 17:37:53 +01:00
parent c77138c273
commit d4cd9e298e
2 changed files with 6 additions and 6 deletions

6
dist/setup/index.js vendored
View file

@ -105060,9 +105060,9 @@ function run() {
core.debug("JAVA_VERSION input is empty, looking for .java-version file"); core.debug("JAVA_VERSION input is empty, looking for .java-version file");
const versionFileName = '.java-version'; const versionFileName = '.java-version';
const contents = fs_1.default.readFileSync(versionFileName).toString().trim(); const contents = fs_1.default.readFileSync(versionFileName).toString().trim();
const coercedStr = semver.coerce(contents, { loose: true }); const semverRegExp = /(\d+\.\d+\.\d+|\d+\.\d+|\d+$)/;
const version = semver.valid(coercedStr); const version = semverRegExp.test(contents) ? RegExp.$1 : "";
core.info(version ? version : "not found"); core.info(semver.valid(version) ? semver.valid(version) : "not found");
versions.push(contents); versions.push(contents);
} }
if (versions.length !== toolchainIds.length) { if (versions.length !== toolchainIds.length) {

View file

@ -25,9 +25,9 @@ async function run() {
core.debug("JAVA_VERSION input is empty, looking for .java-version file") core.debug("JAVA_VERSION input is empty, looking for .java-version file")
const versionFileName = '.java-version' const versionFileName = '.java-version'
const contents = fs.readFileSync(versionFileName).toString().trim(); const contents = fs.readFileSync(versionFileName).toString().trim();
const coercedStr = semver.coerce(contents, { loose: true }) const semverRegExp = /(\d+\.\d+\.\d+|\d+\.\d+|\d+$)/
const version = semver.valid(coercedStr); const version = semverRegExp.test(contents) ? RegExp.$1 : "";
core.info(version ? version : "not found") core.info(semver.valid(version) ? semver.valid(version) as string : "not found")
versions.push(contents) versions.push(contents)
} }