break distro out into separate files

This commit is contained in:
George Adams 2020-05-26 15:30:46 +01:00
parent 712f5a3f16
commit e5c6ca31f3
No known key found for this signature in database
GPG key ID: 7B8D7E4421A0916D
4 changed files with 193 additions and 171 deletions

View file

@ -11,14 +11,21 @@ async function run() {
if (!version) {
version = core.getInput(constants.INPUT_JAVA_VERSION, {required: true});
}
<<<<<<< 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 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, vendor, arch, jdkFile, javaPackage);
await installer.getJava(version, distro, arch, jdkFile, javaPackage);
const matchersPath = path.join(__dirname, '..', '..', '.github');
core.info(`##[add-matcher]${path.join(matchersPath, 'java.json')}`);