From eecb4122f75d5347ee5ac2a4a63254b53e30fb50 Mon Sep 17 00:00:00 2001 From: Mario Loriedo Date: Wed, 7 May 2025 09:25:21 +0200 Subject: [PATCH] Build windows arm64 artifacts Includes the necessary changes so that the `Makefile` target `release-artifacts` builds the `-windows_arm64.zip` too. In particular the arm64 versions of gvproxy and win-sshproxy are downloaded as part of the windows arm64 release zip file. Signed-off-by: Mario Loriedo --- Makefile | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index bcb8bc6579..611079f748 100644 --- a/Makefile +++ b/Makefile @@ -848,7 +848,7 @@ podman-remote-release-%.zip: test/version/version ## Build podman-remote for %=$ $(MAKE) $(GOPLAT) podman-remote; \ fi if [[ "$(GOOS)" == "windows" ]]; then \ - $(MAKE) $(GOPLAT) TMPDIR="" win-gvproxy; \ + $(MAKE) $(GOPLAT) TMPDIR="" win-gvproxy-$(GOARCH); \ fi if [[ "$(GOOS)" == "darwin" ]]; then \ $(MAKE) $(GOPLAT) podman-mac-helper;\ @@ -863,10 +863,15 @@ podman-remote-release-%.zip: test/version/version ## Build podman-remote for %=$ # Downloads pre-built gvproxy and win-sshproxy helpers. See comment on GVPROXY_VERSION declaration .PHONY: win-gvproxy -win-gvproxy: test/version/version +win-gvproxy: win-gvproxy-amd64 # Keep this target for backwards compatibility + +win-gvproxy-%: test/version/version + $(eval GOARCH := $*) + $(eval GVPROXY_FILENAME := $(if $(filter arm64,$(GOARCH)), gvproxy-windows-arm64.exe,gvproxy-windowsgui.exe)) + $(eval SSHPROXY_FILENAME := $(if $(filter arm64,$(GOARCH)), win-sshproxy-arm64.exe, win-sshproxy.exe)) mkdir -p bin/windows/ - curl -sSL -o bin/windows/gvproxy.exe --retry 5 https://github.com/containers/gvisor-tap-vsock/releases/download/$(GVPROXY_VERSION)/gvproxy-windowsgui.exe - curl -sSL -o bin/windows/win-sshproxy.exe --retry 5 https://github.com/containers/gvisor-tap-vsock/releases/download/$(GVPROXY_VERSION)/win-sshproxy.exe + curl -sSL -o bin/windows/gvproxy.exe --retry 5 https://github.com/containers/gvisor-tap-vsock/releases/download/$(GVPROXY_VERSION)/$(GVPROXY_FILENAME) + curl -sSL -o bin/windows/win-sshproxy.exe --retry 5 https://github.com/containers/gvisor-tap-vsock/releases/download/$(GVPROXY_VERSION)/$(SSHPROXY_FILENAME) .PHONY: rpm rpm: ## Build rpm packages @@ -1060,6 +1065,8 @@ release-artifacts: clean-binaries mv podman-remote-release-darwin_arm64.zip release/ $(MAKE) podman-remote-release-windows_amd64.zip mv podman-remote-release-windows_amd64.zip release/ + $(MAKE) podman-remote-release-windows_arm64.zip + mv podman-remote-release-windows_arm64.zip release/ $(MAKE) podman-remote-static-linux_amd64 tar -cvzf podman-remote-static-linux_amd64.tar.gz bin/podman-remote-static-linux_amd64 $(MAKE) podman-remote-static-linux_arm64