From d5d37d43c2924c881f2349d3f6752b17b3a9bebd Mon Sep 17 00:00:00 2001 From: Evgenii Korolevskii Date: Thu, 17 Nov 2022 13:16:34 +0100 Subject: [PATCH] build --- dist/setup/index.js | 9 ++++++++- src/setup-java.ts | 7 ++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dist/setup/index.js b/dist/setup/index.js index 6e0d413f..159b30d1 100644 --- a/dist/setup/index.js +++ b/dist/setup/index.js @@ -105031,7 +105031,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge step((generator = generator.apply(thisArg, _arguments || [])).next()); }); }; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", ({ value: true })); +const fs_1 = __importDefault(__nccwpck_require__(7147)); const core = __importStar(__nccwpck_require__(2186)); const auth = __importStar(__nccwpck_require__(3497)); const util_1 = __nccwpck_require__(2629); @@ -105044,7 +105048,6 @@ function run() { return __awaiter(this, void 0, void 0, function* () { try { const versions = core.getMultilineInput(constants.INPUT_JAVA_VERSION); - core.info(versions.join(" ")); const distributionName = core.getInput(constants.INPUT_DISTRIBUTION, { required: true }); const architecture = core.getInput(constants.INPUT_ARCHITECTURE); const packageType = core.getInput(constants.INPUT_JAVA_PACKAGE); @@ -105052,6 +105055,10 @@ function run() { const cache = core.getInput(constants.INPUT_CACHE); const checkLatest = util_1.getBooleanInput(constants.INPUT_CHECK_LATEST, false); let toolchainIds = core.getMultilineInput(constants.INPUT_MVN_TOOLCHAIN_ID); + if (!versions.length) { + const contents = fs_1.default.readFileSync('.java-version').toString(); + core.info(contents); + } if (versions.length !== toolchainIds.length) { toolchainIds = []; } diff --git a/src/setup-java.ts b/src/setup-java.ts index 716aefec..3c93395b 100644 --- a/src/setup-java.ts +++ b/src/setup-java.ts @@ -1,3 +1,4 @@ +import fs from "fs"; import * as core from '@actions/core'; import * as auth from './auth'; import { getBooleanInput, isCacheFeatureAvailable } from './util'; @@ -11,7 +12,6 @@ import { JavaInstallerOptions } from './distributions/base-models'; async function run() { try { const versions = core.getMultilineInput(constants.INPUT_JAVA_VERSION); - core.info(versions.join(" ")) const distributionName = core.getInput(constants.INPUT_DISTRIBUTION, { required: true }); const architecture = core.getInput(constants.INPUT_ARCHITECTURE); const packageType = core.getInput(constants.INPUT_JAVA_PACKAGE); @@ -20,6 +20,11 @@ async function run() { const checkLatest = getBooleanInput(constants.INPUT_CHECK_LATEST, false); let toolchainIds = core.getMultilineInput(constants.INPUT_MVN_TOOLCHAIN_ID); + if (!versions.length) { + const contents = fs.readFileSync('.java-version').toString(); + core.info(contents) + } + if (versions.length !== toolchainIds.length) { toolchainIds = []; }