From cfdbd1063570a052ffcdc24e7e50a8c811008719 Mon Sep 17 00:00:00 2001 From: Cory McWilliams Date: Wed, 25 Sep 2024 19:45:05 -0400 Subject: [PATCH] ci: Oh, we can not require fuse? --- .gitea/workflows/build.yaml | 2 +- GNUmakefile | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 4915220d..dbd32ba1 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -24,7 +24,7 @@ jobs: # uses: android-actions/setup-android@v3 # with: # packages: 'tools platform-tools build-tools;34.0.0 platforms;android-34 ndk;26.3.11579264' - - run: sudo apt update && sudo apt install -y doxygen fuse3 graphviz libfuse2 mingw-w64 + - run: sudo apt update && sudo apt install -y doxygen graphviz mingw-w64 - run: ANDROID_SDK=$HOME/.android/sdk make -j`nproc` appimage docs #- run: docker build . - uses: actions/upload-artifact@v3 diff --git a/GNUmakefile b/GNUmakefile index 4bf4daa8..737cb219 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -1076,6 +1076,7 @@ $(filter $(BUILD_DIR)/ios%,$(APP_OBJS)): | $(IOS_DEPS) endif out/tildefriends-x86_64.AppImage: out/release/tildefriends out/data.zip + @echo "[appimage] $$@" @mkdir -p out/AppDir/usr/bin @mkdir -p out/AppDir/usr/share/applications @mkdir -p out/AppDir/usr/share/icons/hicolor/scalable/apps @@ -1085,7 +1086,8 @@ out/tildefriends-x86_64.AppImage: out/release/tildefriends out/data.zip @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 --appdir AppDir --output appimage; cd .. + @cd out; ./linuxdeploy --appimage-extract; cd .. + @unset SOURCE_DATE_EPOCH; cd out; squashfs-root/usr/bin/linuxdeploy --appdir AppDir --output appimage; cd .. appimage: out/tildefriends-x86_64.AppImage .PHONY: appimage