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

Validate arch at input

Browse source
This commit is contained in:
Austin Shalit 2020-08-19 21:22:33 -07:00
parent 2a54549d2e
commit 1ba1e1b1f6
No known key found for this signature in database
GPG key ID: 4B1567D6898D8368
3 changed files with 10 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

14
dist/setup/index.js vendored
View file

@ -28685,6 +28685,9 @@ function run() {
version = core.getInput(constants.INPUT_JAVA_VERSION, { required: true }); version = core.getInput(constants.INPUT_JAVA_VERSION, { required: true });
} }
const arch = core.getInput(constants.INPUT_ARCHITECTURE, { required: true }); const arch = core.getInput(constants.INPUT_ARCHITECTURE, { required: true });
if (!['x86', 'x64'].includes(arch)) {
throw new Error(`architecture "${arch}" is not in [x86 | x64]`);
}
const javaPackage = core.getInput(constants.INPUT_JAVA_PACKAGE, { const javaPackage = core.getInput(constants.INPUT_JAVA_PACKAGE, {
required: true required: true
}); });
@ -33541,16 +33544,7 @@ function unzipJavaDownload(repoRoot, fileEnding, destinationFolder, extension) {
} }
function getDownloadInfo(refs, version, arch, javaPackage) { function getDownloadInfo(refs, version, arch, javaPackage) {
version = normalizeVersion(version); version = normalizeVersion(version);
let archExtension = ''; const archExtension = arch === 'x86' ? 'i686' : 'x64';
if (arch === 'x86') {
archExtension = 'i686';
}
else if (arch === 'x64') {
archExtension = 'x64';
}
else {
throw new Error(`architecture "${arch}" is not int [x86 | x64]`);
}
let extension = ''; let extension = '';
if (IS_WINDOWS) { if (IS_WINDOWS) {
extension = `-win_${archExtension}.zip`; extension = `-win_${archExtension}.zip`;

9
src/installer.ts
View file

@ -186,14 +186,7 @@ function getDownloadInfo(
): {version: string; url: string} { ): {version: string; url: string} {
version = normalizeVersion(version); version = normalizeVersion(version);
let archExtension = ''; const archExtension = arch === 'x86' ? 'i686' : 'x64';
if (arch === 'x86') {
archExtension = 'i686';
} else if (arch === 'x64') {
archExtension = 'x64';
} else {
throw new Error(`architecture "${arch}" is not int [x86 | x64]`);
}
let extension = ''; let extension = '';
if (IS_WINDOWS) { if (IS_WINDOWS) {

5
src/setup-java.ts
View file

@ -11,7 +11,12 @@ async function run() {
if (!version) { if (!version) {
version = core.getInput(constants.INPUT_JAVA_VERSION, {required: true}); version = core.getInput(constants.INPUT_JAVA_VERSION, {required: true});
} }
const arch = core.getInput(constants.INPUT_ARCHITECTURE, {required: true}); const arch = core.getInput(constants.INPUT_ARCHITECTURE, {required: true});
if (!['x86', 'x64'].includes(arch)) {
throw new Error(`architecture "${arch}" is not in [x86 | x64]`);
}
const javaPackage = core.getInput(constants.INPUT_JAVA_PACKAGE, { const javaPackage = core.getInput(constants.INPUT_JAVA_PACKAGE, {
required: true required: true
}); });