mirror of
https://github.com/actions/setup-java.git
synced 2025-04-21 10:26:46 +00:00
merge master
This commit is contained in:
parent
e8c07a7b43
commit
7ff34c1ddd
6 changed files with 289 additions and 163 deletions
|
@ -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"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue