actions/setup-java
2
0
Fork 0
mirror of https://github.com/actions/setup-java.git synced 2025-04-21 02:16:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

add windows case

Browse source
This commit is contained in:
George Adams 2020-07-28 10:37:26 +01:00
parent b97e00c0da
commit cf3e355b21
No known key found for this signature in database
GPG key ID: 7B8D7E4421A0916D
5 changed files with 17 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

12
.github/workflows/workflow.yml vendored
View file

@ -39,7 +39,7 @@ jobs:
uses: ./
with:
java-version: 13.0.2
vendor: adoptopenjdk
distro: adoptopenjdk
- name: Verify Java 13
if: runner.os != 'windows'
run: __tests__/verify-java.sh 13.0.2 "${{ steps.setup-java-adopt.outputs.path }}" "${{ steps.setup-java-adopt.outputs.version }}"
@ -66,7 +66,7 @@ jobs:
uses: ./
with:
java-version: 13.0.2
vendor: zulu
distro: zulu
- name: Verify Java 13
if: runner.os != 'windows'
run: __tests__/verify-java.sh 13.0.2 "${{ steps.setup-java-zulu.outputs.path }}" "${{ steps.setup-java-zulu.outputs.version }}"
@ -94,9 +94,9 @@ jobs:
uses: ./
with:
java-version: 13
vendor: 'adoptopenjdk'
distro: 'adoptopenjdk'
- name: Verify Java 13
run: __tests__/verify-java.sh 13.0.2
run: __tests__/verify-java.sh 13.0.2 "${{ steps.setup-java.outputs.path }}" "${{ steps.setup-java.outputs.version }}"
test-proxy-zulu:
@ -120,7 +120,7 @@ jobs:
uses: ./
with:
java-version: 13.0.2
vendor: zulu
distro: zulu
- name: Verify Java 13
run: __tests__/verify-java.sh 13.0.2 "${{ steps.setup-java.outputs.path }}" "${{ steps.setup-java.outputs.version }}"
@ -138,6 +138,6 @@ jobs:
uses: ./
with:
java-version: 13.0.2
vendor: zulu
distro: zulu
- name: Verify Java 13
run: __tests__/verify-java.sh 13.0.2 "${{ steps.setup-java.outputs.path }}" "${{ steps.setup-java.outputs.version }}"

6
dist/setup/index.js vendored
View file

@ -17461,6 +17461,9 @@ function getJavaAdoptOpenJDK(version, javaPackage, arch) {
case 'darwin':
OS = 'mac';
break;
case 'win32':
OS = 'windows';
break;
}
const http = new httpm.HttpClient('setup-java', undefined, {
allowRetries: true,
@ -28769,13 +28772,12 @@ function run() {
if (!version) {
version = core.getInput(constants.INPUT_JAVA_VERSION, { required: true });
}
const vendor = core.getInput('vendor', { required: true });
const arch = core.getInput(constants.INPUT_ARCHITECTURE, { required: true });
const javaPackage = core.getInput(constants.INPUT_JAVA_PACKAGE, {
required: true
});
const jdkFile = core.getInput(constants.INPUT_JDK_FILE, { required: false });
const distro = core.getInput('vendor', { required: true });
const distro = core.getInput('distro', { required: true });
yield installer.getJava(version, distro, arch, jdkFile, javaPackage);
const matchersPath = path.join(__dirname, '..', '..', '.github');
core.info(`##[add-matcher]${path.join(matchersPath, 'java.json')}`);

4
package.json
View file

@ -6,8 +6,8 @@
"main": "dist/index.js",
"scripts": {
"build": "ncc build -o dist/setup src/setup-java.ts && ncc build -o dist/cleanup src/cleanup-java.ts",
"format": "prettier --write **/*.ts",
"format-check": "prettier --check **/*.ts",
"format": "prettier --write **/*.ts src/distro/*.ts",
"format-check": "prettier --check **/*.ts src/distro/*.ts",
"prerelease": "npm run-script build",
"release": "git add -f dist/setup/index.js dist/cleanup/index.js",
"test": "jest"

5
src/distro/adoptopenjdk.ts
View file

@ -11,10 +11,13 @@ export async function getJavaAdoptOpenJDK(
let OS = process.platform.toString();
switch(process.platform) {
switch (process.platform) {
case 'darwin':
OS = 'mac';
break;
case 'win32':
OS = 'windows';
break;
}
const http = new httpm.HttpClient('setup-java', undefined, {

3
src/setup-java.ts
View file

@ -11,13 +11,12 @@ async function run() {
if (!version) {
version = core.getInput(constants.INPUT_JAVA_VERSION, {required: true});
}
const vendor = core.getInput('vendor', {required: true});
const arch = core.getInput(constants.INPUT_ARCHITECTURE, {required: true});
const javaPackage = core.getInput(constants.INPUT_JAVA_PACKAGE, {
required: true
});
const jdkFile = core.getInput(constants.INPUT_JDK_FILE, {required: false});
const distro = core.getInput('vendor', {required: true});
const distro = core.getInput('distro', {required: true});
await installer.getJava(version, distro, arch, jdkFile, javaPackage);