mirror of
https://github.com/actions/setup-java.git
synced 2024-08-16 10:19:51 +02:00
Use java-version (#14)
This commit is contained in:
parent
cbc5ae3642
commit
475978becf
4 changed files with 15 additions and 6 deletions
|
@ -19,7 +19,7 @@ steps:
|
||||||
- uses: actions/checkout@latest
|
- uses: actions/checkout@latest
|
||||||
- uses: actions/setup-java@v1
|
- uses: actions/setup-java@v1
|
||||||
with:
|
with:
|
||||||
version: '9.0.4' // The JDK version to make available on the path. Takes a whole or semver Jdk version, or 1.x syntax (e.g. 1.8 => Jdk 8.x)
|
java-version: '9.0.4' // The JDK version to make available on the path. Takes a whole or semver Jdk version, or 1.x syntax (e.g. 1.8 => Jdk 8.x)
|
||||||
architecture: x64 // (x64 or x86) - defaults to x64
|
architecture: x64 // (x64 or x86) - defaults to x64
|
||||||
- run: java -cp java HelloWorldApp
|
- run: java -cp java HelloWorldApp
|
||||||
```
|
```
|
||||||
|
@ -30,7 +30,7 @@ steps:
|
||||||
- uses: actions/checkout@master
|
- uses: actions/checkout@master
|
||||||
- uses: actions/setup-java@v1
|
- uses: actions/setup-java@v1
|
||||||
with:
|
with:
|
||||||
version: '4.0.0'
|
java-version: '4.0.0'
|
||||||
architecture: x64
|
architecture: x64
|
||||||
jdkFile: <path to jdkFile> // Optional - jdkFile to install java from. Useful for versions not supported by Azul
|
jdkFile: <path to jdkFile> // Optional - jdkFile to install java from. Useful for versions not supported by Azul
|
||||||
- run: java -cp java HelloWorldApp
|
- run: java -cp java HelloWorldApp
|
||||||
|
@ -50,7 +50,7 @@ jobs:
|
||||||
- name: Setup java
|
- name: Setup java
|
||||||
uses: actions/setup-java@v1
|
uses: actions/setup-java@v1
|
||||||
with:
|
with:
|
||||||
version: ${{ matrix.java }}
|
java-version: ${{ matrix.java }}
|
||||||
architecture: x64
|
architecture: x64
|
||||||
- run: java -cp java HelloWorldApp
|
- run: java -cp java HelloWorldApp
|
||||||
```
|
```
|
||||||
|
|
|
@ -2,7 +2,7 @@ name: 'Setup Java environment'
|
||||||
description: 'Setup your runner with Java'
|
description: 'Setup your runner with Java'
|
||||||
author: 'GitHub'
|
author: 'GitHub'
|
||||||
inputs:
|
inputs:
|
||||||
version:
|
java-version:
|
||||||
description: 'The JDK version to make available on the path. Takes a whole or semver Jdk version, or 1.x syntax (e.g. 1.8 => Jdk 8.x)'
|
description: 'The JDK version to make available on the path. Takes a whole or semver Jdk version, or 1.x syntax (e.g. 1.8 => Jdk 8.x)'
|
||||||
required: true
|
required: true
|
||||||
architecture:
|
architecture:
|
||||||
|
@ -12,6 +12,9 @@ inputs:
|
||||||
jdkFile:
|
jdkFile:
|
||||||
description: 'Path to where the compressed JDK is located. The path could be in your source repository or a local path on the agent.'
|
description: 'Path to where the compressed JDK is located. The path could be in your source repository or a local path on the agent.'
|
||||||
required: false
|
required: false
|
||||||
|
# Deprecated option, do not use. Will not be supported after October 1, 2019
|
||||||
|
version:
|
||||||
|
description: 'Deprecated. Use java-version instead. Will not be supported after October 1, 2019'
|
||||||
runs:
|
runs:
|
||||||
using: 'node12'
|
using: 'node12'
|
||||||
main: 'lib/setup-java.js'
|
main: 'lib/setup-java.js'
|
||||||
|
|
|
@ -21,7 +21,10 @@ const path = __importStar(require("path"));
|
||||||
function run() {
|
function run() {
|
||||||
return __awaiter(this, void 0, void 0, function* () {
|
return __awaiter(this, void 0, void 0, function* () {
|
||||||
try {
|
try {
|
||||||
const version = core.getInput('version', { required: true });
|
let version = core.getInput('version');
|
||||||
|
if (!version) {
|
||||||
|
version = core.getInput('java-version', { required: true });
|
||||||
|
}
|
||||||
const arch = core.getInput('architecture', { required: true });
|
const arch = core.getInput('architecture', { required: true });
|
||||||
const jdkFile = core.getInput('jdkFile', { required: false }) || '';
|
const jdkFile = core.getInput('jdkFile', { required: false }) || '';
|
||||||
yield installer.getJava(version, arch, jdkFile);
|
yield installer.getJava(version, arch, jdkFile);
|
||||||
|
|
|
@ -4,7 +4,10 @@ import * as path from 'path';
|
||||||
|
|
||||||
async function run() {
|
async function run() {
|
||||||
try {
|
try {
|
||||||
const version = core.getInput('version', {required: true});
|
let version = core.getInput('version');
|
||||||
|
if (!version) {
|
||||||
|
version = core.getInput('java-version', {required: true});
|
||||||
|
}
|
||||||
const arch = core.getInput('architecture', {required: true});
|
const arch = core.getInput('architecture', {required: true});
|
||||||
const jdkFile = core.getInput('jdkFile', {required: false}) || '';
|
const jdkFile = core.getInput('jdkFile', {required: false}) || '';
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue