From 184924c09577cf4a918703a03506d35642f29002 Mon Sep 17 00:00:00 2001 From: theofficialgman <28281419+theofficialgman@users.noreply.github.com> Date: Fri, 6 May 2022 20:21:38 -0400 Subject: [PATCH 1/2] add armv7l support to scripts --- script/build.ts | 2 +- script/dist-info.ts | 8 ++++++-- script/package-debian.ts | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/script/build.ts b/script/build.ts index 223009c5ce2..99e41096b47 100755 --- a/script/build.ts +++ b/script/build.ts @@ -156,7 +156,7 @@ function packageApp() { targetArch = os.arch() } - if (targetArch === 'arm64' || targetArch === 'x64') { + if (targetArch === 'arm64' || targetArch === 'x64' || targetArch === 'armv7l') { return targetArch } diff --git a/script/dist-info.ts b/script/dist-info.ts index 153bed7caae..dcc430b9c08 100644 --- a/script/dist-info.ts +++ b/script/dist-info.ts @@ -143,11 +143,12 @@ export function getReleaseSHA() { return pieces[2] } -export function getDistArchitecture(): 'arm64' | 'x64' { +export function getDistArchitecture(): 'arm64' | 'x64' | 'armv7l' { // If a specific npm_config_arch is set, we use that one instead of the OS arch (to support cross compilation) if ( process.env.npm_config_arch === 'arm64' || - process.env.npm_config_arch === 'x64' + process.env.npm_config_arch === 'x64' || + process.env.npm_config_arch === 'armv7l' ) { return process.env.npm_config_arch } @@ -155,6 +156,9 @@ export function getDistArchitecture(): 'arm64' | 'x64' { if (process.arch === 'arm64') { return 'arm64' } + if (process.arch === 'armv7l') { + return 'armv7l' + } // TODO: Check if it's x64 running on an arm64 Windows with IsWow64Process2 // More info: https://www.rudyhuyn.com/blog/2017/12/13/how-to-detect-that-your-x86-application-runs-on-windows-on-arm/ diff --git a/script/package-debian.ts b/script/package-debian.ts index 15314d519dd..fc6ae2cf57c 100644 --- a/script/package-debian.ts +++ b/script/package-debian.ts @@ -16,7 +16,7 @@ type DebianOptions = { // required src: string dest: string - arch: 'amd64' | 'i386' | 'arm64' + arch: 'amd64' | 'i386' | 'arm64' | 'armhf' // optional description?: string productDescription?: string From 381fce9b12449bdada6fbbd81b87a32619af587d Mon Sep 17 00:00:00 2001 From: Brendan Forster Date: Sat, 7 May 2022 11:35:35 -0300 Subject: [PATCH 2/2] lint fix new files --- script/build.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/script/build.ts b/script/build.ts index 99e41096b47..3b80f978f7f 100755 --- a/script/build.ts +++ b/script/build.ts @@ -156,7 +156,11 @@ function packageApp() { targetArch = os.arch() } - if (targetArch === 'arm64' || targetArch === 'x64' || targetArch === 'armv7l') { + if ( + targetArch === 'arm64' || + targetArch === 'x64' || + targetArch === 'armv7l' + ) { return targetArch }