From 26441ed45c312a15fb8675d7b0f2d8e1f65dadc2 Mon Sep 17 00:00:00 2001 From: Cory McWilliams Date: Wed, 25 Sep 2024 12:49:32 -0400 Subject: [PATCH] Let's try to artifact the appimage. --- .gitea/workflows/build.yaml | 3 +++ GNUmakefile | 14 +++++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 923c3678..05215f50 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -33,3 +33,6 @@ jobs: - uses: actions/upload-artifact@v3 with: path: out/winrelease/tildefriends.exe + - uses: actions/upload-artifact@v3 + with: + path: out/tildefriends-x86_64.AppImage diff --git a/GNUmakefile b/GNUmakefile index b38ea73c..dc06ad71 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -9,6 +9,8 @@ VERSION_NAME := Me upon my pony on my boat. SQLITE_URL := https://www.sqlite.org/2024/sqlite-amalgamation-3460100.zip BUNDLETOOL_URL := https://github.com/google/bundletool/releases/download/1.17.0/bundletool-all-1.17.0.jar +LINUXDEPLOY_URL := https://github.com/linuxdeploy/linuxdeploy/releases/download/1-alpha-20240109-1/linuxdeploy-x86_64.AppImage +LINUXDEPLOY_MD5 := 659d69326199524552bfbbe46cb0adae out/linuxdeploy PROJECT = tildefriends BUILD_DIR ?= out @@ -1070,17 +1072,19 @@ $(IOS_DEPS): $(filter $(BUILD_DIR)/ios%,$(APP_OBJS)): | $(IOS_DEPS) endif -out/Tilde_Friends-x86_64.AppImage: out/release/tildefriends out/data.zip +out/tildefriends-x86_64.AppImage: out/release/tildefriends out/data.zip @mkdir -p out/AppDir/usr/bin @mkdir -p out/AppDir/usr/share/applications @mkdir -p out/AppDir/usr/share/icons/hicolor/scalable/apps - @echo "[Desktop Entry]\nName=Tilde Friends\nExec=tildefriends\nIcon=tildefriends\nType=Application\nCategories=Network" > out/AppDir/usr/share/applications/tildefriends.desktop + @echo $(LINUXDEPLOY_MD5) > out/linuxdeploy.md5 + @test -x out/linuxdeploy || curl -q -L -o out/linuxdeploy $(LINUXDEPLOY_URL) && md5sum -c out/linuxdeploy.md5 && chmod +x out/linuxdeploy + @echo "[Desktop Entry]\nName=tildefriends\nExec=tildefriends\nIcon=tildefriends\nType=Application\nCategories=Network" > out/AppDir/usr/share/applications/tildefriends.desktop @cp src/ios/tildefriends.svg out/AppDir/usr/share/icons/hicolor/scalable/apps/ @cat out/release/tildefriends out/data.zip > out/AppDir/usr/bin/tildefriends @chmod +x out/AppDir/usr/bin/tildefriends - @unset SOURCE_DATE_EPOCH; cd out; linuxdeploy-x86_64.AppImage --appdir AppDir --output appimage; cd .. + @unset SOURCE_DATE_EPOCH; cd out; ./linuxdeploy --appdir AppDir --output appimage; cd .. -appimage: out/Tilde_Friends-x86_64.AppImage +appimage: out/tildefriends-x86_64.AppImage .PHONY: appimage clean: @@ -1129,7 +1133,7 @@ dist: release-apk iosrelease-ipa aab $(if $(HAVE_WIN), out/winrelease/tildefrien @echo "[cp] TildeFriends-$(VERSION_NUMBER).fdroid.apk" @cp out/TildeFriends-release.fdroid.apk dist/TildeFriends-$(VERSION_NUMBER).fdroid.apk @echo "[cp] TildeFriends-x86_64-$(VERSION_NUMBER).AppImage" - @cp out/Tilde_Friends-x86_64.AppImage dist/TildeFriends-x86_64-$(VERSION_NUMBER).AppImage + @cp out/tildefriends-x86_64.AppImage dist/TildeFriends-x86_64-$(VERSION_NUMBER).AppImage .PHONY: dist dist-test: dist