From 5a3790365586557e0a6b6f551a9b0da50c6f2862 Mon Sep 17 00:00:00 2001 From: Evgenii Korolevskii Date: Thu, 24 Nov 2022 17:48:09 +0100 Subject: [PATCH] ver parse --- dist/setup/index.js | 4 +++- src/setup-java.ts | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dist/setup/index.js b/dist/setup/index.js index 4ef211df..6cf46e7a 100644 --- a/dist/setup/index.js +++ b/dist/setup/index.js @@ -105062,7 +105062,9 @@ function run() { const contents = fs_1.default.readFileSync(versionFileName).toString().trim(); 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"); + const coercedVer = semver.coerce(version); + const validVer = semver.valid(coercedVer); + core.info(validVer ? validVer : "not found"); versions.push(contents); } if (versions.length !== toolchainIds.length) { diff --git a/src/setup-java.ts b/src/setup-java.ts index e13136eb..a79e18f0 100644 --- a/src/setup-java.ts +++ b/src/setup-java.ts @@ -27,7 +27,9 @@ async function run() { const contents = fs.readFileSync(versionFileName).toString().trim(); 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") + const coercedVer = semver.coerce(version) + const validVer = semver.valid(coercedVer) + core.info(validVer ? validVer as string : "not found") versions.push(contents) }