Merge branch 'master' into patch-1

This commit is contained in:
James Kleeh 2019-11-22 13:45:19 -05:00 committed by GitHub
commit dd10aa8837
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions

View file

@ -16,10 +16,10 @@ See [action.yml](action.yml)
Basic:
```yaml
steps:
- uses: actions/checkout@latest
- uses: actions/checkout@v1
- uses: actions/setup-java@v1
with:
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). To specify a specific version for JDK 8 or older use the following pattern (8.0.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). To specify a specific version for JDK 8 or older use the following pattern (8.0.x)
architecture: x64 // (x64 or x86) - defaults to x64
- run: java -cp java HelloWorldApp
```
@ -27,7 +27,7 @@ steps:
From local file:
```yaml
steps:
- uses: actions/checkout@master
- uses: actions/checkout@v1
- uses: actions/setup-java@v1
with:
java-version: '4.0.0'

View file

@ -1,9 +1,9 @@
name: 'Setup Java environment'
description: 'Setup your runner with Java'
name: 'Setup Java JDK'
description: 'Set up a specific version of the Java JDK and add the command-line tools to the PATH'
author: 'GitHub'
inputs:
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
architecture:
description: 'The architecture (x86, x64) of the JDK.'