Merge branch 'master' into patch-1

actions · Nov 22, 2019 · dd10aa8 · dd10aa8
2 parents 0cd7033 + b02f296
commit dd10aa8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -16,18 +16,18 @@ 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
 ```
 
 From local file:
 ```yaml
 steps:
-- uses: actions/checkout@master
+- uses: actions/checkout@v1
 - uses: actions/setup-java@v1
   with:
     java-version: '4.0.0'

diff --git a/action.yml b/action.yml
@@ -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.'