actions/setup-java
1
0
Fork 0
mirror of https://gitea.com/actions/setup-java.git synced 2025-11-04 05:39:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Dont fail if jdkFile not set until checking cache

Browse Source
This commit is contained in:
Danny McCormick
2019-07-15 11:26:32 -04:00
parent 609f104c5b
commit 012e07621e
5 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/installer.js
View File

@@ -46,6 +46,9 @@ function getJava(version, arch, jdkFile) {
core.debug(`Tool found in cache ${toolPath}`);
}
else {
if (!jdkFile) {
throw new Error(`Failed to find Java ${version} in the cache. Please specify a valid jdk file to install from instead.`);
}
core.debug('Retrieving Jdk from local path');
const compressedFileExtension = getFileEnding(jdkFile);
let tempDir = path.join(tempDirectory, 'temp_' + Math.floor(Math.random() * 2000000000));

2
lib/setup-java.js
View File

@@ -23,7 +23,7 @@ function run() {
try {
const version = core.getInput('version', { required: true });
const arch = core.getInput('architecture', { required: true });
const jdkFile = core.getInput('jdkFile', { required: true });
const jdkFile = core.getInput('jdkFile', { required: false }) || '';
yield installer.getJava(version, arch, jdkFile);
const matchersPath = path.join(__dirname, '..', '.github');
console.log(`##[add-matcher]${path.join(matchersPath, 'java.json')}`);