CI/Appimage: Use fuse3 compatible appimagetool

Backport from: https://github.com/stenzek/duckstation/pull/3251

Co-Authored-By: Samuel <36420837+samueru-sama@users.noreply.github.com>
This commit is contained in:
KamFretoZ 2024-08-05 17:56:46 +07:00 committed by Ty
parent b0940094f0
commit 3a53144bdb
3 changed files with 33 additions and 9 deletions

View File

@ -68,6 +68,8 @@ jobs:
- name: Checkout Repository - name: Checkout Repository
uses: actions/checkout@v4 uses: actions/checkout@v4
with:
fetch-depth: 0
# actions/checkout elides tags, fetch them primarily for releases # actions/checkout elides tags, fetch them primarily for releases
- name: Fetch Tags - name: Fetch Tags

View File

@ -63,9 +63,9 @@ declare -a REMOVE_LIBS=(
set -e set -e
LINUXDEPLOY=./linuxdeploy-x86_64.AppImage LINUXDEPLOY=./linuxdeploy-x86_64
LINUXDEPLOY_PLUGIN_QT=./linuxdeploy-plugin-qt-x86_64.AppImage LINUXDEPLOY_PLUGIN_QT=./linuxdeploy-plugin-qt-x86_64
APPIMAGETOOL=./appimagetool-x86_64.AppImage APPIMAGETOOL=./appimagetool-x86_64
PATCHELF=patchelf PATCHELF=patchelf
if [ ! -f "$LINUXDEPLOY" ]; then if [ ! -f "$LINUXDEPLOY" ]; then
@ -78,8 +78,11 @@ if [ ! -f "$LINUXDEPLOY_PLUGIN_QT" ]; then
chmod +x "$LINUXDEPLOY_PLUGIN_QT" chmod +x "$LINUXDEPLOY_PLUGIN_QT"
fi fi
# Using go-appimage
# Backported from https://github.com/stenzek/duckstation/pull/3251
if [ ! -f "$APPIMAGETOOL" ]; then if [ ! -f "$APPIMAGETOOL" ]; then
"$PCSX2DIR/tools/retry.sh" wget -O "$APPIMAGETOOL" https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage APPIMAGETOOLURL=$(wget -q https://api.github.com/repos/probonopd/go-appimage/releases -O - | sed 's/[()",{} ]/\n/g' | grep -o 'https.*continuous.*tool.*86_64.*mage$' | head -1)
"$PCSX2DIR/tools/retry.sh" wget -O "$APPIMAGETOOL" "$APPIMAGETOOLURL"
chmod +x "$APPIMAGETOOL" chmod +x "$APPIMAGETOOL"
fi fi
@ -199,6 +202,16 @@ for hookpath in "$SCRIPTDIR/apprun-hooks"/*; do
done done
echo "Generating AppImage..." echo "Generating AppImage..."
rm -f "$NAME.AppImage" GIT_VERSION=$(git tag --points-at HEAD)
$APPIMAGETOOL -v "$OUTDIR" "$NAME.AppImage"
if [[ "${GIT_VERSION}" == "" ]]; then
# In the odd event that we run this script before the release gets tagged.
GIT_VERSION=$(git describe --tags)
if [[ "${GIT_VERSION}" == "" ]]; then
GIT_VERSION=$(git rev-parse HEAD)
fi
fi
rm -f "$NAME.AppImage"
ARCH=x86_64 VERSION="${GIT_VERSION}" "$APPIMAGETOOL" -s "$OUTDIR" && mv ./*.AppImage "$NAME.AppImage"

View File

@ -18,14 +18,23 @@
<url type="faq">https://pcsx2.net/docs/</url> <url type="faq">https://pcsx2.net/docs/</url>
<url type="help">https://pcsx2.net/discord</url> <url type="help">https://pcsx2.net/discord</url>
<url type="translate">https://crowdin.com/project/pcsx2-emulator</url> <url type="translate">https://crowdin.com/project/pcsx2-emulator</url>
<url type="vcs-browser">https://github.com/PCSX2/pcsx2</url>
<url type="contact">https://mastodon.social/@PCSX2</url> <url type="contact">https://mastodon.social/@PCSX2</url>
<screenshots> <screenshots>
<screenshot type="default"> <screenshot type="default">
<image>https://raw.githubusercontent.com/PCSX2/pcsx2/master/.github/workflows/scripts/linux/flatpak/screenshots/screenshot1.png</image> <image>
https://raw.githubusercontent.com/PCSX2/pcsx2/master/.github/workflows/scripts/linux/flatpak/screenshots/screenshot1.png
</image>
<caption>
The main PCSX2 Qt interface
</caption>
</screenshot> </screenshot>
<screenshot> <screenshot>
<image>https://raw.githubusercontent.com/PCSX2/pcsx2/master/.github/workflows/scripts/linux/flatpak/screenshots/screenshot2.png</image> <image>
https://raw.githubusercontent.com/PCSX2/pcsx2/master/.github/workflows/scripts/linux/flatpak/screenshots/screenshot2.png
</image>
<caption>
PCSX2 running a game
</caption>
</screenshot> </screenshot>
</screenshots> </screenshots>
<content_rating type="oars-1.1"/> <content_rating type="oars-1.1"/>