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

fix lint issues

Browse source
This commit is contained in:
George Adams 2020-05-26 15:37:44 +01:00
parent e5c6ca31f3
commit 079229f185
No known key found for this signature in database
GPG key ID: 7B8D7E4421A0916D
4 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
action.yml
View file

@ -9,7 +9,7 @@ inputs:
Early access versions can be specified in the form of e.g. 14-ea, Early access versions can be specified in the form of e.g. 14-ea,
14.0.0-ea, or 14.0.0-ea.28' 14.0.0-ea, or 14.0.0-ea.28'
required: true required: true
vendor: distro:
description: 'The vendor to fetch the binary from (adoptopenjdk, zulu). description: 'The vendor to fetch the binary from (adoptopenjdk, zulu).
Defaults to adoptopenjdk' Defaults to adoptopenjdk'
required: false required: false

6
package.json
View file

@ -5,9 +5,15 @@
"description": "setup java action", "description": "setup java action",
"main": "dist/index.js", "main": "dist/index.js",
"scripts": { "scripts": {
<<<<<<< HEAD
"build": "ncc build -o dist/setup src/setup-java.ts && ncc build -o dist/cleanup src/cleanup-java.ts", "build": "ncc build -o dist/setup src/setup-java.ts && ncc build -o dist/cleanup src/cleanup-java.ts",
"format": "prettier --write **/*.ts", "format": "prettier --write **/*.ts",
"format-check": "prettier --check **/*.ts", "format-check": "prettier --check **/*.ts",
=======
"build": "ncc build src/setup-java.ts",
"format": "prettier --write **/*.ts src/distro/*.ts",
"format-check": "prettier --check **/*.ts src/distro/*.ts",
>>>>>>> fix lint issues
"prerelease": "npm run-script build", "prerelease": "npm run-script build",
"release": "git add -f dist/setup/index.js dist/cleanup/index.js", "release": "git add -f dist/setup/index.js dist/cleanup/index.js",
"test": "jest" "test": "jest"

4
src/setup-java.ts
View file

@ -11,6 +11,7 @@ async function run() {
if (!version) { if (!version) {
version = core.getInput(constants.INPUT_JAVA_VERSION, {required: true}); version = core.getInput(constants.INPUT_JAVA_VERSION, {required: true});
} }
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
const vendor = core.getInput('vendor', {required: true}); const vendor = core.getInput('vendor', {required: true});
const arch = core.getInput(constants.INPUT_ARCHITECTURE, {required: true}); const arch = core.getInput(constants.INPUT_ARCHITECTURE, {required: true});
@ -20,6 +21,9 @@ async function run() {
const jdkFile = core.getInput(constants.INPUT_JDK_FILE, {required: false}); const jdkFile = core.getInput(constants.INPUT_JDK_FILE, {required: false});
======= =======
const distro = core.getInput('vendor', {required: true}); 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 arch = core.getInput('architecture', {required: true});
const javaPackage = core.getInput('java-package', {required: true}); const javaPackage = core.getInput('java-package', {required: true});
const jdkFile = core.getInput('jdkFile', {required: false}) || ''; const jdkFile = core.getInput('jdkFile', {required: false}) || '';