opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-05-17 15:18:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix windows arm64 installer build

Browse Source 
This is a followup of https://github.com/containers/podman/pull/26048

It fixes `process-release.ps1` that was always looking for the amd64 release
zip file, even if `$env:PODMAN_ARCH` was set to arm64. With this fix it looks
for the right zip file.

It fixes `winmake.ps1` that, when the `-arch` param was not passed, set `$env:PODMAN_ARCH`
to the empty string instead of the local `$env:GOARCH`.

Signed-off-by: Mario Loriedo <mario.loriedo@gmail.com>
This commit is contained in:
Mario Loriedo
2025-05-07 14:55:48 +02:00
parent 0dd745c86b
commit 04ee90dab3
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/win-installer/build.ps1
View File

@ -105,7 +105,7 @@ if ($ENV:INSTVER -eq "") {
} }
$installerPlatform = "" $installerPlatform = ""
if ($null -eq $ENV:PODMAN_ARCH -or $ENV:PODMAN_ARCH -eq "amd64") { if ($null -eq $ENV:PODMAN_ARCH -or "" -eq $ENV:PODMAN_ARCH -or "amd64" -eq $ENV:PODMAN_ARCH) {
$installerPlatform = "x64" $installerPlatform = "x64"
} elseif ($ENV:PODMAN_ARCH -eq "arm64") { } elseif ($ENV:PODMAN_ARCH -eq "arm64") {
$installerPlatform = "arm64" $installerPlatform = "arm64"

8
contrib/win-installer/process-release.ps1
View File

@ -97,10 +97,14 @@ try {
$restore = 1 $restore = 1
$ProgressPreference = 'SilentlyContinue'; $ProgressPreference = 'SilentlyContinue';
if ($null -eq $ENV:PODMAN_ARCH -or "" -eq $ENV:PODMAN_ARCH ) {
Write-Warning "PODMAN_ARCH not set, defaulting to amd64"
$ENV:PODMAN_ARCH = "amd64"
}
if ($releaseDir.Length -gt 0) { if ($releaseDir.Length -gt 0) {
Copy-Item -Path "$releaseDir/podman-remote-release-windows_amd64.zip" "release.zip" Copy-Item -Path "$releaseDir/podman-remote-release-windows_${ENV:PODMAN_ARCH}.zip" "release.zip"
} else { } else {
DownloadOrSkip "$base_url/releases/download/$version/podman-remote-release-windows_amd64.zip" "release.zip" DownloadOrSkip "$base_url/releases/download/$version/podman-remote-release-windows_${ENV:PODMAN_ARCH}.zip" "release.zip"
DownloadOptional "$base_url/releases/download/$version/shasums" ..\shasums DownloadOptional "$base_url/releases/download/$version/shasums" ..\shasums
} }
Expand-Archive -Path release.zip Expand-Archive -Path release.zip

3
winmake.ps1
View File

@ -14,6 +14,7 @@ param (
Write-Warning "Unsupported architecture $arch. Using default ($defaultArchitecture)." Write-Warning "Unsupported architecture $arch. Using default ($defaultArchitecture)."
return $defaultArchitecture return $defaultArchitecture
} }
return $arch
), ),
[parameter(ValueFromRemainingArguments)][object[]]$params = @() [parameter(ValueFromRemainingArguments)][object[]]$params = @()
) )
@ -108,7 +109,7 @@ function Installer{
[string]$version, [string]$version,
[string]$suffix = "dev" [string]$suffix = "dev"
); );
Write-Host "Building the windows installer" Write-Host "Building the windows installer for $architecture"
# Check for the files to include in the installer # Check for the files to include in the installer
$requiredArtifacts = @( $requiredArtifacts = @(