Skip to content

Commit

Permalink
add armv7l support to scripts (#712)
Browse files Browse the repository at this point in the history
* add armv7l support to scripts

* lint fix new files

Co-authored-by: Brendan Forster <github@brendanforster.com>
  • Loading branch information
theofficialgman and shiftkey committed Sep 6, 2022
1 parent 0127dd1 commit 47cd3d4
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 4 deletions.
6 changes: 5 additions & 1 deletion script/build.ts
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,11 @@ function packageApp() {
targetArch = os.arch()
}

if (targetArch === 'arm64' || targetArch === 'x64') {
if (
targetArch === 'arm64' ||
targetArch === 'x64' ||
targetArch === 'armv7l'
) {
return targetArch
}

Expand Down
8 changes: 6 additions & 2 deletions script/dist-info.ts
Original file line number Diff line number Diff line change
Expand Up @@ -143,18 +143,22 @@ 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
}

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/
Expand Down
2 changes: 1 addition & 1 deletion script/package-debian.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 47cd3d4

Please sign in to comment.