Skip to content

Commit

Permalink
Use java-version (#14)
Browse files Browse the repository at this point in the history
  • Loading branch information
Danny McCormick committed Aug 13, 2019
1 parent cbc5ae3 commit 475978b
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 6 deletions.
6 changes: 3 additions & 3 deletions README.md
Expand Up @@ -19,7 +19,7 @@ steps:
- uses: actions/checkout@latest
- uses: actions/setup-java@v1
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
- run: java -cp java HelloWorldApp
```
Expand All @@ -30,7 +30,7 @@ steps:
- uses: actions/checkout@master
- uses: actions/setup-java@v1
with:
version: '4.0.0'
java-version: '4.0.0'
architecture: x64
jdkFile: <path to jdkFile> // Optional - jdkFile to install java from. Useful for versions not supported by Azul
- run: java -cp java HelloWorldApp
Expand All @@ -50,7 +50,7 @@ jobs:
- name: Setup java
uses: actions/setup-java@v1
with:
version: ${{ matrix.java }}
java-version: ${{ matrix.java }}
architecture: x64
- run: java -cp java HelloWorldApp
```
Expand Down
5 changes: 4 additions & 1 deletion action.yml
Expand Up @@ -2,7 +2,7 @@ name: 'Setup Java environment'
description: 'Setup your runner with Java'
author: 'GitHub'
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)'
required: true
architecture:
Expand All @@ -12,6 +12,9 @@ inputs:
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.'
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:
using: 'node12'
main: 'lib/setup-java.js'
5 changes: 4 additions & 1 deletion lib/setup-java.js
Expand Up @@ -21,7 +21,10 @@ const path = __importStar(require("path"));
function run() {
return __awaiter(this, void 0, void 0, function* () {
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 jdkFile = core.getInput('jdkFile', { required: false }) || '';
yield installer.getJava(version, arch, jdkFile);
Expand Down
5 changes: 4 additions & 1 deletion src/setup-java.ts
Expand Up @@ -4,7 +4,10 @@ import * as path from 'path';

async function run() {
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 jdkFile = core.getInput('jdkFile', {required: false}) || '';

Expand Down

0 comments on commit 475978b

Please sign in to comment.