Skip to content

Commit efc3b17

Browse files
committed
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 <[email protected]>
1 parent 35e1c20 commit efc3b17

File tree

1 file changed

+11
-4
lines changed

1 file changed

+11
-4
lines changed

Makefile

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -847,7 +847,7 @@ podman-remote-release-%.zip: test/version/version ## Build podman-remote for %=$
847847
$(MAKE) $(GOPLAT) podman-remote; \
848848
fi
849849
if [[ "$(GOOS)" == "windows" ]]; then \
850-
$(MAKE) $(GOPLAT) TMPDIR="" win-gvproxy; \
850+
$(MAKE) $(GOPLAT) TMPDIR="" win-gvproxy-$(GOARCH); \
851851
fi
852852
if [[ "$(GOOS)" == "darwin" ]]; then \
853853
$(MAKE) $(GOPLAT) podman-mac-helper;\
@@ -862,10 +862,15 @@ podman-remote-release-%.zip: test/version/version ## Build podman-remote for %=$
862862

863863
# Downloads pre-built gvproxy and win-sshproxy helpers. See comment on GVPROXY_VERSION declaration
864864
.PHONY: win-gvproxy
865-
win-gvproxy: test/version/version
865+
win-gvproxy: win-gvproxy-amd64 # Keep this target for backwards compatibility
866+
867+
win-gvproxy-%: test/version/version
868+
$(eval GOARCH := $*)
869+
$(eval GVPROXY_FILENAME := $(if $(filter arm64,$(GOARCH)), gvproxy-windows-arm64.exe,gvproxy-windowsgui.exe))
870+
$(eval SSHPROXY_FILENAME := $(if $(filter arm64,$(GOARCH)), win-sshproxy-arm64.exe, win-sshproxy.exe))
866871
mkdir -p bin/windows/
867-
curl -sSL -o bin/windows/gvproxy.exe --retry 5 https://github.com/containers/gvisor-tap-vsock/releases/download/$(GVPROXY_VERSION)/gvproxy-windowsgui.exe
868-
curl -sSL -o bin/windows/win-sshproxy.exe --retry 5 https://github.com/containers/gvisor-tap-vsock/releases/download/$(GVPROXY_VERSION)/win-sshproxy.exe
872+
curl -sSL -o bin/windows/gvproxy.exe --retry 5 https://github.com/containers/gvisor-tap-vsock/releases/download/$(GVPROXY_VERSION)/$(GVPROXY_FILENAME)
873+
curl -sSL -o bin/windows/win-sshproxy.exe --retry 5 https://github.com/containers/gvisor-tap-vsock/releases/download/$(GVPROXY_VERSION)/$(SSHPROXY_FILENAME)
869874

870875
.PHONY: rpm
871876
rpm: ## Build rpm packages
@@ -1059,6 +1064,8 @@ release-artifacts: clean-binaries
10591064
mv podman-remote-release-darwin_arm64.zip release/
10601065
$(MAKE) podman-remote-release-windows_amd64.zip
10611066
mv podman-remote-release-windows_amd64.zip release/
1067+
$(MAKE) podman-remote-release-windows_arm64.zip
1068+
mv podman-remote-release-windows_arm64.zip release/
10621069
$(MAKE) podman-remote-static-linux_amd64
10631070
tar -cvzf podman-remote-static-linux_amd64.tar.gz bin/podman-remote-static-linux_amd64
10641071
$(MAKE) podman-remote-static-linux_arm64

0 commit comments

Comments
 (0)