aleleba/lightcraft
1
0
Fork 0
mirror of https://github.com/storytold/lightcraft.git synced 2026-10-28 12:08:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

build: fix host architecture detection in Windows PowerShell 5.1

Browse Source 
Use Windows environment variables instead of RuntimeInformation
to avoid a null value during the final CLI smoke test.

Account for emulated shells using PROCESSOR_ARCHITEW6432.
This commit is contained in:
draco892
2026-10-13 12:00:04 +02:00
parent eec4746a56
commit bd0ca28bb0
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packaging/windows/package.ps1
+9 -1
View File
@@ -167,7 +167,15 @@ Compress-Archive -Path $Portable -DestinationPath $Zip
# Smoke-test the CLI when this machine can run it. An ARM64 build made on an x64 runner can't run
# here; .github/workflows/windows-arm64.yml installs and runs it on ARM64 instead.
$HostArch = [System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture.ToString().ToLowerInvariant()
# Windows PowerShell 5.1 can expose OSArchitecture as null. Use Windows' environment
# variables instead; PROCESSOR_ARCHITEW6432 identifies the OS when the shell is emulated.
$nativeArchitecture = if ($env:PROCESSOR_ARCHITEW6432) { $env:PROCESSOR_ARCHITEW6432 } else { $env:PROCESSOR_ARCHITECTURE }
$HostArch = switch ($nativeArchitecture) {
'AMD64' { 'x64' }
'x86' { 'x86' }
'ARM64' { 'arm64' }
default { 'unknown' }
}
if ($Arch -ne 'arm64' -or $HostArch -eq 'arm64') {
Invoke-Native 'lightcraft-cli --version' { & (Join-Path $Stage 'lightcraft-cli.exe') --version }
} else {