Architecture Support (#95)

AustinShalit · emgre · web-flow · commit d34a7e45c881 · 2020-08-24T12:35:41.000+02:00
* Quick fix for 32-bit architecture support.

* Validate arch at input

Co-authored-by: Émile Grégoire &lt;eg@emilegregoire.ca&gt;
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/setup/index.js b/dist/setup/index.js
@@ -28685,6 +28685,9 @@ function run() {
                 version = core.getInput(constants.INPUT_JAVA_VERSION, { 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, {
                 required: true
             });
@@ -33423,7 +33426,7 @@ function getJava(version, arch, jdkFile, javaPackage) {
                 }
                 const contents = yield response.readBody();
                 const refs = contents.match(/<a href.*\">/gi) || [];
-                const downloadInfo = getDownloadInfo(refs, version, javaPackage);
+                const downloadInfo = getDownloadInfo(refs, version, arch, javaPackage);
                 jdkFile = yield tc.downloadTool(downloadInfo.url);
                 version = downloadInfo.version;
                 compressedFileExtension = IS_WINDOWS ? '.zip' : '.tar.gz';
@@ -33539,20 +33542,22 @@ function unzipJavaDownload(repoRoot, fileEnding, destinationFolder, extension) {
         }
     });
 }
-function getDownloadInfo(refs, version, javaPackage) {
+function getDownloadInfo(refs, version, arch, javaPackage) {
     version = normalizeVersion(version);
+    const archExtension = arch === 'x86' ? 'i686' : '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') {
diff --git a/src/installer.ts b/src/installer.ts
@@ -45,7 +45,7 @@ export async function getJava(
 
       const contents = await response.readBody();
       const refs = contents.match(/<a href.*\">/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';
@@ -181,20 +181,26 @@ async function unzipJavaDownload(
 function getDownloadInfo(
   refs: string[],
   version: string,
+  arch: string,
   javaPackage: string
 ): {version: string; url: string} {
   version = normalizeVersion(version);
+
+  const archExtension = arch === 'x86' ? 'i686' : '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') {
diff --git a/src/setup-java.ts b/src/setup-java.ts
@@ -11,7 +11,12 @@ async function run() {
     if (!version) {
       version = core.getInput(constants.INPUT_JAVA_VERSION, {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, {
       required: true
     });

Original file line number	Diff line number	Diff line change
`@@ -28685,6 +28685,9 @@ function run() {`
`28685`	`28685`	`version = core.getInput(constants.INPUT_JAVA_VERSION, { required: true });`
`28686`	`28686`	`}`
`28687`	`28687`	`const arch = core.getInput(constants.INPUT_ARCHITECTURE, { required: true });`
	`28688`	`+ if (!['x86', 'x64'].includes(arch)) {`
	`28689`	+ throw new Error(`architecture "${arch}" is not in [x86 \| x64]`);
	`28690`	`+ }`
`28688`	`28691`	`const javaPackage = core.getInput(constants.INPUT_JAVA_PACKAGE, {`
`28689`	`28692`	`required: true`
`28690`	`28693`	`});`
`@@ -33423,7 +33426,7 @@ function getJava(version, arch, jdkFile, javaPackage) {`
`33423`	`33426`	`}`
`33424`	`33427`	`const contents = yield response.readBody();`
`33425`	`33428`	`const refs = contents.match(/<a href.*\">/gi) \|\| [];`
`33426`		`- const downloadInfo = getDownloadInfo(refs, version, javaPackage);`
	`33429`	`+ const downloadInfo = getDownloadInfo(refs, version, arch, javaPackage);`
`33427`	`33430`	`jdkFile = yield tc.downloadTool(downloadInfo.url);`
`33428`	`33431`	`version = downloadInfo.version;`
`33429`	`33432`	`compressedFileExtension = IS_WINDOWS ? '.zip' : '.tar.gz';`
`@@ -33539,20 +33542,22 @@ function unzipJavaDownload(repoRoot, fileEnding, destinationFolder, extension) {`
`33539`	`33542`	`}`
`33540`	`33543`	`});`
`33541`	`33544`	`}`
`33542`		`-function getDownloadInfo(refs, version, javaPackage) {`
	`33545`	`+function getDownloadInfo(refs, version, arch, javaPackage) {`
`33543`	`33546`	`version = normalizeVersion(version);`
	`33547`	`+ const archExtension = arch === 'x86' ? 'i686' : 'x64';`
`33544`	`33548`	`let extension = '';`
`33545`	`33549`	`if (IS_WINDOWS) {`
`33546`		- extension = `-win_x64.zip`;
	`33550`	+ extension = `-win_${archExtension}.zip`;
`33547`	`33551`	`}`
`33548`	`33552`	`else {`
`33549`	`33553`	`if (process.platform === 'darwin') {`
`33550`		- extension = `-macosx_x64.tar.gz`;
	`33554`	+ extension = `-macosx_${archExtension}.tar.gz`;
`33551`	`33555`	`}`
`33552`	`33556`	`else {`
`33553`		- extension = `-linux_x64.tar.gz`;
	`33557`	+ extension = `-linux_${archExtension}.tar.gz`;
`33554`	`33558`	`}`
`33555`	`33559`	`}`
	`33560`	+ core.debug(`Searching for files with extension: ${extension}`);
`33556`	`33561`	`let pkgRegexp = new RegExp('');`
`33557`	`33562`	`let pkgTypeLength = 0;`
`33558`	`33563`	`if (javaPackage === 'jdk') {`