1
0
Fork 0
mirror of https://github.com/actions/setup-java synced 2024-12-23 05:34:56 +00:00

Merge branch 'master' into master

This commit is contained in:
Gil Tene 2019-11-20 22:23:25 -08:00 committed by GitHub
commit 7c96a7c451
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions

View file

@ -16,7 +16,7 @@ See [action.yml](action.yml)
Basic: Basic:
```yaml ```yaml
steps: steps:
- uses: actions/checkout@latest - uses: actions/checkout@v1
- uses: actions/setup-java@v1 - uses: actions/setup-java@v1
with: with:
java-version: '11.0.4' // The Java version to make available on the path. Takes a whole or semver Java version, or 1.x syntax (e.g. 1.8 => Jdk 8.x) java-version: '11.0.4' // The Java version to make available on the path. Takes a whole or semver Java version, or 1.x syntax (e.g. 1.8 => Jdk 8.x)
@ -28,7 +28,7 @@ steps:
From local file: From local file:
```yaml ```yaml
steps: steps:
- uses: actions/checkout@master - uses: actions/checkout@v1
- uses: actions/setup-java@v1 - uses: actions/setup-java@v1
with: with:
java-version: '4.0.0' java-version: '4.0.0'

View file

@ -1,9 +1,9 @@
name: 'Setup Java environment' name: 'Setup Java JDK'
description: 'Setup your runner with Java' description: 'Set up a specific version of the Java JDK and add the command-line tools to the PATH'
author: 'GitHub' author: 'GitHub'
inputs: inputs:
java-version: java-version:
description: 'The Java version to make available on the path. Takes a whole or semver Java version, or 1.x syntax (e.g. 1.8 => Jdk 8.x)' description: 'The Java version to make available on the path. Takes a whole or semver Java version, or 1.x syntax (e.g. 1.8 => Java 8.x)'
required: true required: true
java-package: java-package:
description: 'The package type (jre, jdk, jdk+fx)' description: 'The package type (jre, jdk, jdk+fx)'