merge master

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

View file

@ -5,15 +5,9 @@
"description": "setup java action",
"main": "dist/index.js",
"scripts": {
<<<<<<< HEAD
"build": "ncc build -o dist/setup src/setup-java.ts && ncc build -o dist/cleanup src/cleanup-java.ts",
"format": "prettier --write **/*.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",
"release": "git add -f dist/setup/index.js dist/cleanup/index.js",
"test": "jest"