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

Add optional java-package parameter

Browse source
This commit is contained in:
Gil Tene 2019-11-02 18:21:29 -07:00
commit fb7e2ed37c
2 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/installer.js
View file

@ -177,14 +177,18 @@ function getDownloadInfo(refs, version, javaPackage) {
} }
} }
let pkgRegexp = new RegExp(''); let pkgRegexp = new RegExp('');
let pkgTypeLength = 0;
if (javaPackage === 'jdk') { if (javaPackage === 'jdk') {
pkgRegexp = /jdk.*-/gi; pkgRegexp = /jdk.*-/gi;
pkgTypeLength = 'jdk'.length;
} }
else if (javaPackage == 'jre') { else if (javaPackage == 'jre') {
pkgRegexp = /jre.*-/gi; pkgRegexp = /jre.*-/gi;
pkgTypeLength = 'jre'.length;
} }
else if (javaPackage == 'jdk+fx') { else if (javaPackage == 'jdk+fx') {
pkgRegexp = /fx-jdk.*-/gi; pkgRegexp = /fx-jdk.*-/gi;
pkgTypeLength = 'fx-jdk'.length;
} }
else { else {
throw new Error(`package argument ${javaPackage} is not in [jdk | jre | jdk+fx]`); throw new Error(`package argument ${javaPackage} is not in [jdk | jre | jdk+fx]`);
@ -204,7 +208,7 @@ function getDownloadInfo(refs, version, javaPackage) {
if (versions.length == 0) { if (versions.length == 0) {
return; return;
} }
const refVersion = versions[0].slice('jdk'.length, versions[0].length - 1); const refVersion = versions[0].slice(pkgTypeLength, versions[0].length - 1);
if (semver.satisfies(refVersion, version)) { if (semver.satisfies(refVersion, version)) {
versionMap.set(refVersion, 'https://static.azul.com/zulu/bin/' + versionMap.set(refVersion, 'https://static.azul.com/zulu/bin/' +
ref.slice('<a href="'.length, ref.length - '">'.length)); ref.slice('<a href="'.length, ref.length - '">'.length));

12
src/installer.ts
View file

@ -67,7 +67,7 @@ export async function getJava(
core.debug(`jdk extracted to ${jdkDir}`); core.debug(`jdk extracted to ${jdkDir}`);
toolPath = await tc.cacheDir( toolPath = await tc.cacheDir(
jdkDir, jdkDir,
javaPackage, javaPackage,
getCacheVersionString(version), getCacheVersionString(version),
arch arch
); );
@ -190,14 +190,20 @@ function getDownloadInfo(
} }
let pkgRegexp = new RegExp(''); let pkgRegexp = new RegExp('');
let pkgTypeLength = 0;
if (javaPackage === 'jdk') { if (javaPackage === 'jdk') {
pkgRegexp = /jdk.*-/gi; pkgRegexp = /jdk.*-/gi;
pkgTypeLength = 'jdk'.length;
} else if (javaPackage == 'jre') { } else if (javaPackage == 'jre') {
pkgRegexp = /jre.*-/gi; pkgRegexp = /jre.*-/gi;
pkgTypeLength = 'jre'.length;
} else if (javaPackage == 'jdk+fx') { } else if (javaPackage == 'jdk+fx') {
pkgRegexp = /fx-jdk.*-/gi; pkgRegexp = /fx-jdk.*-/gi;
pkgTypeLength = 'fx-jdk'.length;
} else { } else {
throw new Error(`package argument ${javaPackage} is not in [jdk | jre | jdk+fx]`); throw new Error(
`package argument ${javaPackage} is not in [jdk | jre | jdk+fx]`
);
} }
// Maps version to url // Maps version to url
@ -219,7 +225,7 @@ function getDownloadInfo(
if (versions.length == 0) { if (versions.length == 0) {
return; return;
} }
const refVersion = versions[0].slice('jdk'.length, versions[0].length - 1); const refVersion = versions[0].slice(pkgTypeLength, versions[0].length - 1);
if (semver.satisfies(refVersion, version)) { if (semver.satisfies(refVersion, version)) {
versionMap.set( versionMap.set(