mirror of
https://github.com/actions/setup-java.git
synced 2025-04-20 01:46:46 +00:00
parseversion
This commit is contained in:
parent
c77138c273
commit
d4cd9e298e
2 changed files with 6 additions and 6 deletions
6
dist/setup/index.js
vendored
6
dist/setup/index.js
vendored
|
@ -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) {
|
||||
|
|
|
@ -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)
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue