actions/setup-java
2
0
Fork 0
mirror of https://github.com/actions/setup-java.git synced 2025-04-21 02:16:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

merge master

Browse source
This commit is contained in:
George Adams 2020-07-28 10:23:06 +01:00
parent e8c07a7b43
commit 7ff34c1ddd
No known key found for this signature in database
GPG key ID: 7B8D7E4421A0916D
6 changed files with 289 additions and 163 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/setup-java.ts
View file

@ -11,23 +11,13 @@ async function run() {
if (!version) {
version = core.getInput(constants.INPUT_JAVA_VERSION, {required: true});
}
<<<<<<< HEAD
<<<<<<< HEAD
const vendor = core.getInput('vendor', {required: true});
const arch = core.getInput(constants.INPUT_ARCHITECTURE, {required: true});
const javaPackage = core.getInput(constants.INPUT_JAVA_PACKAGE, {
required: true
});
const jdkFile = core.getInput(constants.INPUT_JDK_FILE, {required: false});
=======
const distro = core.getInput('vendor', {required: true});
=======
const distro = core.getInput('distro', {required: true});
>>>>>>> fix lint issues
const arch = core.getInput('architecture', {required: true});
const javaPackage = core.getInput('java-package', {required: true});
const jdkFile = core.getInput('jdkFile', {required: false}) || '';
>>>>>>> break distro out into separate files
await installer.getJava(version, distro, arch, jdkFile, javaPackage);