From 5de2c1ae68c932e93ee24193ef8a3dd8b6f9d280 Mon Sep 17 00:00:00 2001 From: Jan De Dobbeleer Date: Tue, 14 Sep 2021 22:30:42 +0200 Subject: [PATCH] fix(linux): add armv7l build resolves #956 --- .github/workflows/artifacts.yml | 2 ++ .github/workflows/release.yml | 2 ++ packages/powershell/oh-my-posh/deploy.ps1 | 2 +- packages/powershell/oh-my-posh/oh-my-posh.psm1 | 5 ++++- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/artifacts.yml b/.github/workflows/artifacts.yml index 7cdb434b..a488ab12 100644 --- a/.github/workflows/artifacts.yml +++ b/.github/workflows/artifacts.yml @@ -18,6 +18,8 @@ jobs: include: - os: ubuntu-latest goarch: arm64 + - os: ubuntu-latest + goarch: arm - os: windows-latest goarch: 386 - os: windows-latest diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f81cae0e..fcd116c1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -48,6 +48,8 @@ jobs: include: - os: ubuntu-latest goarch: arm64 + - os: ubuntu-latest + goarch: arm - os: windows-latest goarch: 386 - os: windows-latest diff --git a/packages/powershell/oh-my-posh/deploy.ps1 b/packages/powershell/oh-my-posh/deploy.ps1 index dc50620a..0739340c 100644 --- a/packages/powershell/oh-my-posh/deploy.ps1 +++ b/packages/powershell/oh-my-posh/deploy.ps1 @@ -20,7 +20,7 @@ Param Copy-Item -Path "../../../themes" -Destination "./themes" -Recurse # fetch all the binaries from the version's GitHub release New-Item -Path "./" -Name "bin" -ItemType "directory" -"posh-windows-amd64.exe", "posh-windows-386.exe", "posh-windows-arm64.exe", "posh-darwin-amd64", "posh-linux-amd64", "posh-linux-arm64" | ForEach-Object -Process { +"posh-windows-amd64.exe", "posh-windows-386.exe", "posh-windows-arm64.exe", "posh-darwin-amd64", "posh-linux-amd64", "posh-linux-arm", "posh-linux-arm64" | ForEach-Object -Process { $download = "https://github.com/jandedobbeleer/oh-my-posh/releases/download/v$BinVersion/$_" Invoke-WebRequest $download -Out "./bin/$_" } diff --git a/packages/powershell/oh-my-posh/oh-my-posh.psm1 b/packages/powershell/oh-my-posh/oh-my-posh.psm1 index d5c39491..14609e32 100644 --- a/packages/powershell/oh-my-posh/oh-my-posh.psm1 +++ b/packages/powershell/oh-my-posh/oh-my-posh.psm1 @@ -14,9 +14,12 @@ function Get-PoshCommand { if ($IsLinux) { # this is rather hacky but there's no other way for the time being $arch = uname -m - if (($arch -eq 'aarch64') -or ($arch -eq 'armv7l')) { + if ($arch -eq 'aarch64') { return "$PSScriptRoot/bin/posh-linux-arm64" } + if ($arch -eq 'armv7l') { + return "$PSScriptRoot/bin/posh-linux-arm" + } return "$PSScriptRoot/bin/posh-linux-amd64" } $arch = (Get-CimInstance -Class Win32_Processor -Property Architecture).Architecture