From 1c0643f31cd5c50e8e0cc15a77471d58a6c2bc9c Mon Sep 17 00:00:00 2001 From: Samuel <36420837+Samueru-sama@users.noreply.github.com> Date: Tue, 27 Aug 2024 18:34:17 -0400 Subject: [PATCH 1/3] appimage.sh enable zsync updates --- dist/linux/appimage.sh | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dist/linux/appimage.sh b/dist/linux/appimage.sh index e9081521f..85eaa3da4 100755 --- a/dist/linux/appimage.sh +++ b/dist/linux/appimage.sh @@ -6,8 +6,8 @@ fi curl -sSfLO "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage" chmod a+x linuxdeploy*.AppImage -curl -sSfL https://github.com"$(curl https://github.com/probonopd/go-appimage/releases/expanded_assets/continuous | grep "mkappimage-.*-x86_64.AppImage" | head -n 1 | cut -d '"' -f 2)" -o mkappimage.AppImage -chmod a+x mkappimage.AppImage +curl -sSfL "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage" -o appimagetool +chmod a+x appimagetool curl -sSfLO "https://raw.githubusercontent.com/linuxdeploy/linuxdeploy-plugin-gtk/master/linuxdeploy-plugin-gtk.sh" chmod a+x linuxdeploy-plugin-gtk.sh curl -sSfLO "https://github.com/darealshinji/linuxdeploy-plugin-checkrt/releases/download/continuous/linuxdeploy-plugin-checkrt.sh" @@ -34,9 +34,10 @@ chmod +x AppDir/usr/bin/Cemu cp /usr/lib/x86_64-linux-gnu/{libsepol.so.1,libffi.so.7,libpcre.so.3,libGLU.so.1,libthai.so.0} AppDir/usr/lib -export UPD_INFO="gh-releases-zsync|cemu-project|Cemu|ci|Cemu.AppImage.zsync" +export UPD_INFO="gh-releases-zsync|$GITHUB_REPOSITORY_OWNER|Cemu|latest|Cemu-*x86_64.AppImage.zsync" +export APPIMAGE_EXTRACT_AND_RUN=1 export NO_STRIP=1 -./linuxdeploy-x86_64.AppImage --appimage-extract-and-run \ +./linuxdeploy-x86_64.AppImage \ --appdir="${GITHUB_WORKSPACE}"/AppDir/ \ -d "${GITHUB_WORKSPACE}"/AppDir/info.cemu.Cemu.desktop \ -i "${GITHUB_WORKSPACE}"/AppDir/info.cemu.Cemu.png \ @@ -52,7 +53,8 @@ echo "Cemu Version Cemu-${GITVERSION}" rm AppDir/usr/lib/libwayland-client.so.0 cp /lib/x86_64-linux-gnu/libstdc++.so.6 AppDir/usr/lib/ echo -e "export LC_ALL=C\nexport FONTCONFIG_PATH=/etc/fonts" >> AppDir/apprun-hooks/linuxdeploy-plugin-gtk.sh -VERSION="${GITVERSION}" ./mkappimage.AppImage --appimage-extract-and-run "${GITHUB_WORKSPACE}"/AppDir +./appimagetool --comp zstd --mksquashfs-opt -Xcompression-level --mksquashfs-opt 20 -u "${UPD_INFO}" \ + "${GITHUB_WORKSPACE}"/AppDir Cemu-"${GITVERSION}"-x86_64.AppImage mkdir -p "${GITHUB_WORKSPACE}"/artifacts/ -mv Cemu-"${GITVERSION}"-x86_64.AppImage "${GITHUB_WORKSPACE}"/artifacts/ +mv Cemu-"${GITVERSION}"-x86_64.AppImage* "${GITHUB_WORKSPACE}"/artifacts/ From 897527158351e6b9126c1c4a7004e7f1ab1f337e Mon Sep 17 00:00:00 2001 From: Samuel <36420837+Samueru-sama@users.noreply.github.com> Date: Tue, 27 Aug 2024 18:40:51 -0400 Subject: [PATCH 2/3] CI: add desktop-file-utils dependency for appimagetool --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index dd28ceb54..6e0bf7afd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -96,7 +96,7 @@ jobs: - name: "Install system dependencies" run: | sudo apt update -qq - sudo apt install -y clang-15 cmake freeglut3-dev libgcrypt20-dev libglm-dev libgtk-3-dev libpulse-dev libsecret-1-dev libsystemd-dev nasm ninja-build appstream + sudo apt install -y clang-15 cmake freeglut3-dev libgcrypt20-dev libglm-dev libgtk-3-dev libpulse-dev libsecret-1-dev libsystemd-dev nasm ninja-build appstream desktop-file-utils - name: "Build AppImage" run: | From adf0abf3cbee8edc02ec846c7a3b39b552f26eaf Mon Sep 17 00:00:00 2001 From: Samuel <36420837+Samueru-sama@users.noreply.github.com> Date: Tue, 27 Aug 2024 18:44:45 -0400 Subject: [PATCH 3/3] CI: include appimage zsync --- .github/workflows/deploy_experimental_release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/deploy_experimental_release.yml b/.github/workflows/deploy_experimental_release.yml index 97e0c69e7..62a82a2e0 100644 --- a/.github/workflows/deploy_experimental_release.yml +++ b/.github/workflows/deploy_experimental_release.yml @@ -126,6 +126,7 @@ jobs: echo "Cemu Version is $VERSION" ls cemu-appimage-x64 mv cemu-appimage-x64/Cemu-*-x86_64.AppImage upload/Cemu-$VERSION-x86_64.AppImage + mv cemu-appimage-x64/Cemu-*-x86_64.AppImage.zsync upload/Cemu-$VERSION-x86_64.AppImage.zsync - name: Create release from linux-bin run: |