From d4cd9e298e2d4e15269d3d216767b21a552331d2 Mon Sep 17 00:00:00 2001 From: Evgenii Korolevskii Date: Thu, 24 Nov 2022 17:37:53 +0100 Subject: [PATCH] parseversion --- dist/setup/index.js | 6 +++--- src/setup-java.ts | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dist/setup/index.js b/dist/setup/index.js index ce1d1e6d..4ef211df 100644 --- a/dist/setup/index.js +++ b/dist/setup/index.js @@ -105060,9 +105060,9 @@ function run() { core.debug("JAVA_VERSION input is empty, looking for .java-version file"); const versionFileName = '.java-version'; const contents = fs_1.default.readFileSync(versionFileName).toString().trim(); - const coercedStr = semver.coerce(contents, { loose: true }); - const version = semver.valid(coercedStr); - core.info(version ? version : "not found"); + const semverRegExp = /(\d+\.\d+\.\d+|\d+\.\d+|\d+$)/; + const version = semverRegExp.test(contents) ? RegExp.$1 : ""; + core.info(semver.valid(version) ? semver.valid(version) : "not found"); versions.push(contents); } if (versions.length !== toolchainIds.length) { diff --git a/src/setup-java.ts b/src/setup-java.ts index db5310fb..e13136eb 100644 --- a/src/setup-java.ts +++ b/src/setup-java.ts @@ -25,9 +25,9 @@ async function run() { core.debug("JAVA_VERSION input is empty, looking for .java-version file") const versionFileName = '.java-version' const contents = fs.readFileSync(versionFileName).toString().trim(); - const coercedStr = semver.coerce(contents, { loose: true }) - const version = semver.valid(coercedStr); - core.info(version ? version : "not found") + const semverRegExp = /(\d+\.\d+\.\d+|\d+\.\d+|\d+$)/ + const version = semverRegExp.test(contents) ? RegExp.$1 : ""; + core.info(semver.valid(version) ? semver.valid(version) as string : "not found") versions.push(contents) }