From 8b062ac0cf8238c62b2aae01fc6bffb175b547b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89mile=20Gr=C3=A9goire?= Date: Tue, 14 Apr 2020 14:51:01 -0400 Subject: [PATCH] Quick fix for 32-bit architecture support. --- dist/index.js | Bin 168248 -> 168618 bytes src/installer.ts | 21 +++++++++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dist/index.js b/dist/index.js index 9663265367c82ea787bffe9122dd3970af3e1aad..d81245c076c8dfc79aea8ac3e49578ca42ac0ad3 100644 GIT binary patch delta 420 zcmdn7h-=kSu7(!IEljslSQ3kpGq&GMVe%IQGpDPSF*((P1YIjiQuB&4^YavJ71Y(O zxfFmPGfhDQB&T3&3lyxdFjLo5s0Pb`WHEGQngLZnbk>4ZrREf;q8nmnf?WixtWHmy||p|s3ZWhyNK2R delta 89 zcmZ3rlxxQ#u7(!IEljslwm(c^@)ewJQpV&kJ-?jEfw{uWWcvPcrZjFKL$4&UNH4uA jVR|A5llpXl3MM|moXot^ig;wXi5yH~+h0{M9gqY7sdXPa diff --git a/src/installer.ts b/src/installer.ts index cce8fa3d..5a2c0ae9 100644 --- a/src/installer.ts +++ b/src/installer.ts @@ -60,7 +60,7 @@ export async function getJava( const contents = await response.readBody(); const refs = contents.match(//gi) || []; - const downloadInfo = getDownloadInfo(refs, version, javaPackage); + const downloadInfo = getDownloadInfo(refs, version, arch, javaPackage); jdkFile = await tc.downloadTool(downloadInfo.url); version = downloadInfo.version; compressedFileExtension = IS_WINDOWS ? '.zip' : '.tar.gz'; @@ -188,20 +188,33 @@ async function unzipJavaDownload( function getDownloadInfo( refs: string[], version: string, + arch: string, javaPackage: string ): {version: string; url: string} { version = normalizeVersion(version); + + let archExtension = ''; + if (arch === 'x86') { + archExtension = 'i686'; + } else if (arch === 'x64') { + archExtension = 'x64'; + } else { + throw new Error(`architecture "${arch}" is not int [x86 | x64]`); + } + let extension = ''; if (IS_WINDOWS) { - extension = `-win_x64.zip`; + extension = `-win_${archExtension}.zip`; } else { if (process.platform === 'darwin') { - extension = `-macosx_x64.tar.gz`; + extension = `-macosx_${archExtension}.tar.gz`; } else { - extension = `-linux_x64.tar.gz`; + extension = `-linux_${archExtension}.tar.gz`; } } + core.debug(`Searching for files with extension: ${extension}`); + let pkgRegexp = new RegExp(''); let pkgTypeLength = 0; if (javaPackage === 'jdk') {