Allow for Local ARM64 Linux Building (#1451)

* update project/deploy configs * add system architecture detection to java jre/jvm downloader * Update package.json * update electron-builder and electron-updater arm is added as an alias for armv7l makes building easier
gorilla-devs · Jan 16, 2023 · 4fd9a47 · 4fd9a47
1 parent efa324a
commit 4fd9a47
Show file tree

Hide file tree

Showing 7 changed files with 56 additions and 16 deletions.
diff --git a/.env b/.env
@@ -1,4 +1,3 @@
 SKIP_PREFLIGHT_CHECK=true
 ESLINT_NO_DEV_ERRORS=true
 DISABLE_ESLINT_PLUGIN=true
-SKIP_PREFLIGHT_CHECK=true
diff --git a/package.json b/package.json
@@ -78,7 +78,8 @@
   },
   "cpu": [
     "x64",
-    "arm64"
+    "arm64",
+    "arm"
   ],
   "browserslist": {
     "production": [
@@ -122,9 +123,9 @@
     "concurrently": "^6.2.1",
     "cross-env": "^7.0.3",
     "dotenv": "^10.0.0",
-    "electron": "^19.0.4",
-    "electron-builder": "^23.0.3",
-    "electron-updater": "^5.0.1",
+    "electron": "^19.0.5",
+    "electron-builder": "^23.0.9",
+    "electron-updater": "^5.0.4",
     "eslint": "^7.32.0",
     "eslint-config-airbnb": "^19.0.4",
     "eslint-config-prettier": "^8.3.0",
@@ -152,12 +153,12 @@
     "webpack-merge": "^5.8.0"
   },
   "dependencies": {
-    "7zip-bin": "^5.1.1",
     "@loadable/babel-plugin": "^5.13.2",
     "@sentry/integrations": "^6.16.1",
     "@sentry/react": "^6.16.1",
     "@sentry/tracing": "^6.16.1",
     "@sentry/utils": "^6.16.1",
+    "7zip-bin": "^5.1.1",
     "antd": "^4.21.5",
     "axios": "^0.27.2",
     "base64-stream": "^1.0.0",

diff --git a/public/electron.js b/public/electron.js
@@ -241,7 +241,7 @@ const get7zPath = async () => {
     if (process.platform === 'win32') {
       baseDir = path.join(baseDir, '7zip-bin/win/x64');
     } else if (process.platform === 'linux') {
-      baseDir = path.join(baseDir, '7zip-bin/linux/x64');
+      baseDir = path.join(baseDir, '7zip-bin/linux', process.arch);
     } else if (process.platform === 'darwin') {
       baseDir = path.resolve(baseDir, '../../../', '7zip-bin/mac/x64');
     }

diff --git a/scripts/createDeploy.js b/scripts/createDeploy.js
@@ -109,7 +109,13 @@ if (process.platform === 'win32') {
     filter: '**/*'
   });
 } else if (process.platform === 'linux') {
-  sevenZipPath = 'node_modules/7zip-bin/linux/x64/7za';
+  if (process.arch === 'arm64') {
+    sevenZipPath = 'node_modules/7zip-bin/linux/arm64/7za';
+  } else if (process.arch === 'arm') {
+    sevenZipPath = 'node_modules/7zip-bin/linux/arm/7za';
+  } else {
+    sevenZipPath = 'node_modules/7zip-bin/linux/x64/7za';
+  }
 } else if (process.platform === 'darwin') {
   sevenZipPath = 'node_modules/7zip-bin/mac/x64/7za';
 }
@@ -191,8 +197,8 @@ const commonConfig = {
   ...(process.platform === 'linux' && {
     linux:
       type === 'setup'
-        ? ['appimage:x64', 'zip:x64', 'deb:x64', 'rpm:x64']
-        : ['snap:x64']
+        ? ['appimage', 'zip', 'deb', 'rpm'].map(x => `${x}:${process.arch}`)
+        : [`snap:${process.arch}`]
   }),
   ...(process.platform === 'win32' && {
     win: [type === 'setup' ? 'nsis:x64' : 'zip:x64']
@@ -215,6 +221,13 @@ const main = async () => {
 
   const { productName } = commonConfig.config;
 
+  let linuxyml = '';
+  if (process.arch === 'x64') {
+    linuxyml = 'latest-linux.yml';
+  } else {
+    linuxyml = `latest-linux-${process.arch}.yml`;
+  }
+
   const allFiles = {
     setup: {
       darwin: [
@@ -232,7 +245,7 @@ const main = async () => {
         `${productName}-linux-${type}.AppImage`,
         `${productName}-linux-${type}.deb`,
         `${productName}-linux-${type}.rpm`,
-        'latest-linux.yml'
+        `${linuxyml}`
       ]
     },
     portable: {

diff --git a/src/app/desktop/utils/index.js b/src/app/desktop/utils/index.js
@@ -81,6 +81,21 @@ export const convertOSToJavaFormat = ElectronFormat => {
   }
 };
 
+export const convertArchToJavaFormat = ElectronFormat => {
+  switch (ElectronFormat) {
+    case 'x64':
+      return 'amd64';
+    case 'ia32':
+      return 'x32';
+    case 'arm':
+      return 'arm';
+    case 'arm64':
+      return 'aarch64';
+    default:
+      return false;
+  }
+};
+
 export const skipLibrary = lib => {
   let skip = false;
   if (lib.rules) {
@@ -321,6 +336,7 @@ export const isLatestJavaDownloaded = async (
   version = 8
 ) => {
   const javaOs = convertOSToJavaFormat(process.platform);
+  const javaArch = convertArchToJavaFormat(process.arch);
   let log = null;
 
   const isJavaLatest = version === LATEST_JAVA_VERSION;
@@ -330,7 +346,7 @@ export const isLatestJavaDownloaded = async (
   const javaMeta = manifest.find(
     v =>
       v.os === javaOs &&
-      v.architecture === 'x64' &&
+      v.architecture === javaArch &&
       (v.binary_type === 'jre' || v.binary_type === 'jdk')
   );
   const javaFolder = path.join(

diff --git a/src/common/modals/JavaSetup.js b/src/common/modals/JavaSetup.js
@@ -15,6 +15,7 @@ import Modal from '../components/Modal';
 import { downloadFile } from '../../app/desktop/utils/downloader';
 import {
   convertOSToJavaFormat,
+  convertArchToJavaFormat,
   extractAll,
   isLatestJavaDownloaded
 } from '../../app/desktop/utils';
@@ -367,11 +368,17 @@ const AutomaticSetup = ({
 
   const installJava = async () => {
     const javaOs = convertOSToJavaFormat(process.platform);
-    const java8Meta = javaManifest.find(v => v.os === javaOs);
+    const javaArch = convertArchToJavaFormat(process.arch);
+    const java8Meta = javaManifest.find(
+      v =>
+        v.os === javaOs &&
+        v.architecture === javaArch &&
+        (v.binary_type === 'jre' || v.binary_type === 'jdk')
+    );
     const javaLatestMeta = javaLatestManifest.find(
       v =>
         v.os === javaOs &&
-        v.architecture === 'x64' &&
+        v.architecture === javaArch &&
         (v.binary_type === 'jre' || v.binary_type === 'jdk')
     );
 

diff --git a/src/common/utils/selectors.js b/src/common/utils/selectors.js
@@ -1,7 +1,10 @@
 import { createSelector } from 'reselect';
 import path from 'path';
 import memoize from 'lodash/memoize';
-import { convertOSToJavaFormat } from '../../app/desktop/utils';
+import {
+  convertOSToJavaFormat,
+  convertArchToJavaFormat
+} from '../../app/desktop/utils';
 import { LATEST_JAVA_VERSION } from './constants';
 
 const _instances = state => state.instances;
@@ -59,10 +62,11 @@ export const _getJavaPath = createSelector(
         ver === LATEST_JAVA_VERSION ? java.pathLatest : java.path;
 
       const javaOs = convertOSToJavaFormat(process.platform);
+      const javaArch = convertArchToJavaFormat(process.arch);
       const javaMeta = manifest.find(
         version =>
           version.os === javaOs &&
-          version.architecture === 'x64' &&
+          version.architecture === javaArch &&
           (version.binary_type === 'jre' || version.binary_type === 'jdk')
       );
       const {