From 9ec26a805a584bf246140bb49c7a03d85d391987 Mon Sep 17 00:00:00 2001 From: lat9nq <22451773+lat9nq@users.noreply.github.com> Date: Sun, 16 May 2021 05:07:49 -0400 Subject: [PATCH] ci: linux: Freeze AppImage binaries A regression was introduced on May 13 by linuxdeploy that causes file open dialogs to crash yuzu in the AppImage (likely this commit 1e28ee38fa174279defe70cdaadf2a552c80258c from linuxdeploy/linuxdeploy-desktopfile). Instead of downloading the latest version from each of the repos we use to build the AppImage, just download the ones hosted at yuzu-emu/ext-linux-bin, which are the same binaries we have been using, but verified to be working and won't update on us beyond our control. This can eventually be moved into the container itself to remove the need to download them at build time. --- .ci/scripts/linux/docker.sh | 8 ++++---- .ci/scripts/linux/upload.sh | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.ci/scripts/linux/docker.sh b/.ci/scripts/linux/docker.sh index 1af5ded3da..9b451d3aba 100755 --- a/.ci/scripts/linux/docker.sh +++ b/.ci/scripts/linux/docker.sh @@ -30,10 +30,10 @@ make install DESTDIR=AppDir rm -vf AppDir/usr/bin/yuzu-cmd AppDir/usr/bin/yuzu-tester # Download tools needed to build an AppImage -wget -nc https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage -wget -nc https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage -wget -nc https://github.com/darealshinji/AppImageKit-checkrt/releases/download/continuous/AppRun-patched-x86_64 -wget -nc https://github.com/darealshinji/AppImageKit-checkrt/releases/download/continuous/exec-x86_64.so +wget -nc https://github.com/yuzu-emu/ext-linux-bin/raw/main/appimage/linuxdeploy-x86_64.AppImage +wget -nc https://github.com/yuzu-emu/ext-linux-bin/raw/main/appimage/linuxdeploy-plugin-qt-x86_64.AppImage +wget -nc https://github.com/yuzu-emu/ext-linux-bin/raw/main/appimage/AppRun-patched-x86_64 +wget -nc https://github.com/yuzu-emu/ext-linux-bin/raw/main/appimage/exec-x86_64.so # Set executable bit chmod 755 \ AppRun-patched-x86_64 \ diff --git a/.ci/scripts/linux/upload.sh b/.ci/scripts/linux/upload.sh index b2ea073887..208cd0d049 100644 --- a/.ci/scripts/linux/upload.sh +++ b/.ci/scripts/linux/upload.sh @@ -21,7 +21,7 @@ cp build/bin/yuzu "$DIR_NAME" # Build an AppImage cd build -wget -nc https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage +wget -nc https://github.com/yuzu-emu/ext-linux-bin/raw/main/appimage/appimagetool-x86_64.AppImage chmod 755 appimagetool-x86_64.AppImage if [ "${RELEASE_NAME}" = "mainline" ]; then