From 5e09f33af6ce1fae80c2eaa28d444516acbc7826 Mon Sep 17 00:00:00 2001 From: Evgenii Korolevskii Date: Wed, 7 Dec 2022 08:54:15 +0100 Subject: [PATCH] add java-version-file input --- src/constants.ts | 1 + src/setup-java.ts | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/constants.ts b/src/constants.ts index ad8709e7..e4c8ad14 100644 --- a/src/constants.ts +++ b/src/constants.ts @@ -1,5 +1,6 @@ export const MACOS_JAVA_CONTENT_POSTFIX = 'Contents/Home'; export const INPUT_JAVA_VERSION = 'java-version'; +export const INPUT_JAVA_VERSION_FILE = 'java-version-file'; export const INPUT_ARCHITECTURE = 'architecture'; export const INPUT_JAVA_PACKAGE = 'java-package'; export const INPUT_DISTRIBUTION = 'distribution'; diff --git a/src/setup-java.ts b/src/setup-java.ts index a2e97ec3..0d00179d 100644 --- a/src/setup-java.ts +++ b/src/setup-java.ts @@ -13,6 +13,7 @@ async function run() { try { const versions = core.getMultilineInput(constants.INPUT_JAVA_VERSION); const distributionName = core.getInput(constants.INPUT_DISTRIBUTION, { required: true }); + const versionFile = core.getInput(constants.INPUT_JAVA_VERSION_FILE); const architecture = core.getInput(constants.INPUT_ARCHITECTURE); const packageType = core.getInput(constants.INPUT_JAVA_PACKAGE); const jdkFile = core.getInput(constants.INPUT_JDK_FILE); @@ -26,11 +27,14 @@ async function run() { toolchainIds = []; } + if (!versions.length && !versionFile) { + throw new Error("Java-version or java-version-file input expected"); + } + if (!versions.length) { - core.debug('JAVA_VERSION input is empty, looking for .java-version file'); - const versionFileName = '.java-version'; + core.debug('Java-version input is empty, looking for java-version-file input'); const contents = fs - .readFileSync(versionFileName) + .readFileSync(versionFile) .toString() .trim(); const semverRegExp = /(?(?<=(^|\s|\-))(\d+\S*))(\s|$)/;