AppImage: use up-to-date build-appimage action (#7)

Adjust build recipe accordingly. Co-authored-by: Valeri <[email protected]> Co-authored-by: Christian <[email protected]>
v1993 · Sep 10, 2023 · 2945794 · 2945794
1 parent 710fafc
commit 2945794
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml
@@ -47,7 +47,7 @@ jobs:
           set -eu
           find build -mindepth 1 -maxdepth 1 -type d | while read -r path; do
             set -a
-            APPIMAGE_PATH="${path}"
+            APPIMAGE_SOURCE="${path}"
             APPIMAGE_VERSION="${GITHUB_REF_SLUG}"
             APPIMAGE_APT_ARCH="${TARGET_PLATFORM#*/}"
             APPIMAGE_APT_DISTRO="${UBUNTU_RELEASE}"
@@ -57,7 +57,7 @@ jobs:
           done
 
       - name: Build AppImage
-        uses: AppImageCrafters/build-appimage@v1
+        uses: AppImageCrafters/build-appimage@v1.3
         with:
           recipe: dist/AppImageBuilder.yml
 

diff --git a/dist/AppImageBuilder.yml b/dist/AppImageBuilder.yml
@@ -2,13 +2,14 @@ version: 1
 
 script:
 - |
-  icon_path="{{APPIMAGE_PATH}}/usr/share/icons/hicolor/128x128/apps"
+  mv "{{APPIMAGE_SOURCE}}" "${TARGET_APPDIR}"
+  icon_path="${TARGET_APPDIR}/usr/share/icons/hicolor/128x128/apps"
   mkdir -p "${icon_path}"
   cp -a dist/evdevhook2.png "${icon_path}"
+  # Manual installation is required until fix of https://github.com/AppImageCrafters/build-appimage/issues/5
+  apt-get update && apt-get install -y --no-install-recommends squashfs-tools
 
 AppDir:
-  path: "{{APPIMAGE_PATH}}"
-
   app_info:
     id: org.v1993.evdevhook2
     name: evdevhook2
@@ -18,7 +19,7 @@ AppDir:
     exec_args: $@
 
   after_runtime: |
-    echo "X-AppImage-Integrate=false" >> "{{APPIMAGE_PATH}}/org.v1993.evdevhook2.desktop"
+    echo "X-AppImage-Integrate=false" >> "${TARGET_APPDIR}/org.v1993.evdevhook2.desktop"
 
   apt:
     arch: