From 0cbf66c00752f3ace76404d94311764115bd25a6 Mon Sep 17 00:00:00 2001
From: Cory McWilliams <cory@unprompted.com>
Date: Tue, 24 Dec 2024 10:31:09 -0500
Subject: [PATCH] build: Let's try to artifact the x86_64 + ARM linux
 executables.

---
 .gitea/workflows/build.yaml | 13 ++++++-------
 GNUmakefile                 | 11 +++++++++--
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml
index 36da6d39f..06a884749 100644
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@@ -29,10 +29,9 @@ jobs:
       - run: docker build .
       - uses: actions/upload-artifact@v3
         with:
-          path: out/TildeFriends-release.fdroid.apk
-      - uses: actions/upload-artifact@v3
-        with:
-          path: out/winrelease/tildefriends.exe
-      - uses: actions/upload-artifact@v3
-        with:
-          path: out/tildefriends-x86_64.AppImage
+          path: |
+            out/TildeFriends-release.fdroid.apk
+            out/winrelease/tildefriends.exe
+            out/tildefriends-x86_64.AppImage
+            out/release/tildefriends.standalone
+            out/armrelease/tildefriends.standalone
diff --git a/GNUmakefile b/GNUmakefile
index 937132678..8ba27d1d1 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -160,6 +160,9 @@ all: $(IOS_APPS) \
 	out/tildefriends-iossimdebug.app/tildefriends \
 	out/tildefriends-iossimrelease.app/tildefriends
 endif
+ifeq ($(HAVE_CROSS_AARCH64),1)
+all: out/armrelease/tildefriends.standalone
+endif
 
 DEBUG_TARGETS := \
 	out/debug/tildefriends \
@@ -264,7 +267,7 @@ $(LINUX_TARGETS) $(MACOS_TARGETS): LDFLAGS += -Ldeps/openssl/$(UNAME_S)/$(UNAME_
 
 ifeq ($(UNAME_M),x86_64)
 ifeq ($(UNAME_S),Linux)
-all: appimage
+all: appimage out/release/tildefriends.standalone
 endif
 ifneq ($(UNAME_S),Haiku)
 out/debug/tildefriends: CFLAGS += -fsanitize=address -fsanitize=undefined -fno-common
@@ -1238,7 +1241,7 @@ tarball: ## Build an all-inclusive source tarball (.tar.xz).
 .PHONY: tarball
 
 dist: ## Build versions of all distributables for release.
-dist: release-apk iosrelease-ipa aab $(if $(HAVE_WIN), out/winrelease/tildefriends.standalone.exe) out/TildeFriends-release.fdroid.apk appimage tarball
+dist: release-apk iosrelease-ipa aab $(if $(HAVE_WIN), out/winrelease/tildefriends.standalone.exe) out/TildeFriends-release.fdroid.apk appimage tarball out/release/tildefriends.standalone $(if $(HAVE_CROSS_AARCH64), out/armrelease/tildefriends.standalone)
 	@mkdir -p dist/
 	@echo "[cp] tildefriends-$(VERSION_NUMBER).tar.xz"
 	@cp out/tildefriends-$(VERSION_NUMBER).tar.xz dist/tildefriends-$(VERSION_NUMBER).tar.xz
@@ -1256,6 +1259,10 @@ dist: release-apk iosrelease-ipa aab $(if $(HAVE_WIN), out/winrelease/tildefrien
 	@cp out/TildeFriends-release.fdroid.apk dist/TildeFriends-$(VERSION_NUMBER).fdroid.apk
 	@echo "[cp] TildeFriends-x86_64-$(VERSION_NUMBER).AppImage"
 	@cp out/tildefriends-x86_64.AppImage dist/TildeFriends-x86_64-$(VERSION_NUMBER).AppImage
+	@echo "[cp] tildefriends-linux-$(UNAME_M)-$(VERSION_NUMBER)"
+	@cp out/release/tildefriends.standalone dist/tildefriends-linux-$(UNAME_M)-$(VERSION_NUMBER)
+	@test $(HAVE_CROSS_AARCH64) && echo "[cp] tildefriends-linux-aarch64-$(VERSION_NUMBER)"
+	@test $(HAVE_CROSS_AARCH64) && cp out/armrelease/tildefriends.standalone dist/tildefriends-linux-aarch64-$(VERSION_NUMBER)
 .PHONY: dist
 
 dist-test: dist ## Exercise some built distributable files, making sure they work as intended.