Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Made the AppImage updatable & get rid of libfuse2 dependency #36

Merged
merged 8 commits into from
Feb 1, 2025
Merged

Made the AppImage updatable & get rid of libfuse2 dependency #36

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d23b7d8
Use appimagetool to create updateable AppImages
ivan-hc Jan 31, 2025
da7bb5c
Fix typo
ivan-hc Jan 31, 2025
476bd5d
Fix mounting appimagetool without FUSE
ivan-hc Jan 31, 2025
0ec2a20
Add desktop-file-utils and zsync
ivan-hc Jan 31, 2025
503105d
Set GITHUB_REPOSITORY_OWNER
ivan-hc Jan 31, 2025
28cf144
Fix appimagetool downloaded twice
ivan-hc Jan 31, 2025
be7586f
Fix appimagetool
ivan-hc Feb 1, 2025
b428372
Fix, no need --appimage-extract-and-run outside of docker
ivan-hc Feb 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions make-appimage.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ sudo DEBIAN_FRONTEND=noninteractive -i sh -c "apt update && apt -y upgrade && \
cmake \
curl \
$CC \
desktop-file-utils \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ivan-hc Why is this needed now?

Copy link
Contributor Author

@ivan-hc ivan-hc Feb 1, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sometime appimagetool require to check if the .desktop file has valid entries, if not to bundle the AppImage fails.

I don't know you, but in my experience I had long workflows failed at the last moment because appigetool was looking for desktop-file-validate in $PATH, so from then I always added this in all my projects.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Then it sounds like this would be another package that should be added to the linuxdeploy image.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ivan-hc Oh, it should already be installed https://github.com/andy5995/linuxdeploy-build-helper-container/blob/cb4f350b2d420d9942fe4591db52504388dfdca0/Dockerfile#L13

libboost-dev \
libboost-filesystem-dev \
libboost-system-dev \
Expand All @@ -68,7 +69,8 @@ sudo DEBIAN_FRONTEND=noninteractive -i sh -c "apt update && apt -y upgrade && \
patchelf \
python3 \
rustc \
zlib1g-dev"
zlib1g-dev \
zsync"

# needed for spidermonkey build
#export SHELL=/bin/bash
Expand Down Expand Up @@ -209,13 +211,21 @@ linuxdeploy \
--library=/usr/lib/$ARCH-linux-gnu/libthai.so.0 \
--custom-apprun=$WORKSPACE/AppRun \
--appdir $APPDIR \
--output appimage \
--plugin gtk
fi

DATE_STR=$(date +%y%m%d%H%M)
OUT_APPIMAGE="0ad-$VERSION-$DATE_STR-$ARCH.AppImage"
mv 0_A.D.-$VERSION-$ARCH.AppImage $OUT_APPIMAGE

REPO="0ad-appimage"
TAG="latest"
[ -z "$GITHUB_REPOSITORY_OWNER" ] && GITHUB_REPOSITORY_OWNER="0ad-matters"
UPINFO="gh-releases-zsync|$GITHUB_REPOSITORY_OWNER|$REPO|$TAG|*$ARCH.AppImage.zsync"

appimagetool --comp zstd --mksquashfs-opt -Xcompression-level --mksquashfs-opt 20 \
-u "$UPINFO" \
"$APPDIR" "$OUT_APPIMAGE"

sha1sum $OUT_APPIMAGE > "$OUT_APPIMAGE.sha1sum"
cat "$OUT_APPIMAGE.sha1sum"

Expand Down