Merge branch 'add-build-targets'

mullvad · Jun 11, 2024 · e559707 · e559707
2 parents b22456c + 91bbb6e
commit e559707
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,6 +19,10 @@ Line wrap the file at 100 chars.                                              Th
 * **Fixed**: for any bug fixes.
 * **Security**: in case of vulnerabilities.
 
+## [Unreleased]
+### Added
+- Add build target for Linux ARMv5, ARMv6, ARMv6 and Windows ARM64.
+
 ## [1.0.1] - 2024-04-16
 ### Security
 - Update dependencies

diff --git a/Makefile b/Makefile
@@ -47,9 +47,9 @@ build-container:
 .PHONY: build
 build: build-container
 	podman run --rm -v .:/build:Z -w /build \
-		-e GOOS=${GOOS} -e GOARCH=${GOARCH} \
+		-e GOOS=${GOOS} -e GOARCH=${GOARCH} -e GOARM=${GOARM} \
 		-it wgephemeralpeer \
-		sh -c 'make BIN=${BIN}${EXT} && zip ${BIN}_${VERSION}_${GOOS}_${GOARCH}.zip ${BIN}${EXT}'
+		sh -c 'ARMV=$${GOARM:+v$$GOARM};make BIN=${BIN}${EXT} && zip ${BIN}_${VERSION}_${GOOS}_${GOARCH}$$ARMV.zip ${BIN}${EXT}'
 
 .PHONY: release-darwin-amd64
 release-darwin-amd64:
@@ -67,15 +67,35 @@ release-linux-amd64:
 release-linux-arm64:
 	$(MAKE) GOOS=linux GOARCH=arm64 build
 
+.PHONY: release-linux-armv5
+release-linux-armv5:
+	$(MAKE) GOOS=linux GOARCH=arm GOARM=5 build
+
+.PHONY: release-linux-armv6
+release-linux-armv6:
+	$(MAKE) GOOS=linux GOARCH=arm GOARM=6 build
+
+.PHONY: release-linux-armv7
+release-linux-armv7:
+	$(MAKE) GOOS=linux GOARCH=arm GOARM=7 build
+
 .PHONY: release-windows-amd64
 release-windows-amd64:
 	$(MAKE) GOOS=windows GOARCH=amd64 EXT=.exe build
 
+.PHONY: release-windows-aŕm64
+release-windows-arm64:
+	$(MAKE) GOOS=windows GOARCH=arm64 EXT=.exe build
+
 .PHONY: release
 release: \
 	clean \
 	release-darwin-amd64 \
 	release-darwin-arm64 \
 	release-linux-amd64 \
 	release-linux-arm64 \
+	release-linux-armv5 \
+	release-linux-armv6 \
+	release-linux-armv7 \
 	release-windows-amd64
+	release-windows-arm64
diff --git a/artifacts.list b/artifacts.list
@@ -2,4 +2,8 @@ mullvad-upgrade-tunnel_v?.?.?_darwin_amd64.zip
 mullvad-upgrade-tunnel_v?.?.?_darwin_arm64.zip
 mullvad-upgrade-tunnel_v?.?.?_linux_amd64.zip
 mullvad-upgrade-tunnel_v?.?.?_linux_arm64.zip
+mullvad-upgrade-tunnel_v?.?.?_linux_armv5.zip
+mullvad-upgrade-tunnel_v?.?.?_linux_armv6.zip
+mullvad-upgrade-tunnel_v?.?.?_linux_armv7.zip
 mullvad-upgrade-tunnel_v?.?.?_windows_amd64.zip
+mullvad-upgrade-tunnel_v?.?.?_windows_arm64.zip