From 8dcd17f2ef018ac2aa2c9b0581eead14e2652dc5 Mon Sep 17 00:00:00 2001 From: Evgenii Korolevskii Date: Thu, 24 Nov 2022 16:38:22 +0100 Subject: [PATCH] parse version --- dist/setup/index.js | 3 +++ src/setup-java.ts | 3 +++ 2 files changed, 6 insertions(+) diff --git a/dist/setup/index.js b/dist/setup/index.js index f2ff9e66..5b1ec81e 100644 --- a/dist/setup/index.js +++ b/dist/setup/index.js @@ -105044,6 +105044,7 @@ const constants = __importStar(__nccwpck_require__(9042)); const cache_1 = __nccwpck_require__(4810); const path = __importStar(__nccwpck_require__(1017)); const distribution_factory_1 = __nccwpck_require__(924); +const semver = __importStar(__nccwpck_require__(1383)); function run() { return __awaiter(this, void 0, void 0, function* () { try { @@ -105059,6 +105060,8 @@ 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 version = semver.valid(contents); + core.info(version ? version : "not found"); versions.push(contents); } if (versions.length !== toolchainIds.length) { diff --git a/src/setup-java.ts b/src/setup-java.ts index ea5bec0a..87c6beec 100644 --- a/src/setup-java.ts +++ b/src/setup-java.ts @@ -8,6 +8,7 @@ import { restore } from './cache'; import * as path from 'path'; import { getJavaDistribution } from './distributions/distribution-factory'; import { JavaInstallerOptions } from './distributions/base-models'; +import * as semver from 'semver'; async function run() { try { @@ -24,6 +25,8 @@ 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 version = semver.valid(contents); + core.info(version ? version : "not found") versions.push(contents) }