summaryrefslogtreecommitdiff
path: root/.ci/scripts/linux/docker.sh
diff options
context:
space:
mode:
authorGravatar lat9nq2022-09-26 00:29:38 -0400
committerGravatar lat9nq2022-09-26 00:35:03 -0400
commitad9f97cd8dbdaa95ef11418b699f74e57f37cbbc (patch)
treef58e2cd28b179039c1486fde91d666467d0bf3f5 /.ci/scripts/linux/docker.sh
parentMerge pull request #8941 from Kelebek1/single_core_sucks (diff)
downloadyuzu-ad9f97cd8dbdaa95ef11418b699f74e57f37cbbc.tar.gz
yuzu-ad9f97cd8dbdaa95ef11418b699f74e57f37cbbc.tar.xz
yuzu-ad9f97cd8dbdaa95ef11418b699f74e57f37cbbc.zip
ci/linux: Drop linuxdeploy usage
Recent versions of Docker appear to cause the Qt linuxdeploy plugin to throw a boost file copy error. This switches from linuxdeploy to a script of mine I've been working on for a while.
Diffstat (limited to '')
-rwxr-xr-x.ci/scripts/linux/docker.sh8
1 files changed, 3 insertions, 5 deletions
diff --git a/.ci/scripts/linux/docker.sh b/.ci/scripts/linux/docker.sh
index e85dba029..67726ee0f 100755
--- a/.ci/scripts/linux/docker.sh
+++ b/.ci/scripts/linux/docker.sh
@@ -33,16 +33,14 @@ DESTDIR="$PWD/AppDir" ninja install
33rm -vf AppDir/usr/bin/yuzu-cmd AppDir/usr/bin/yuzu-tester 33rm -vf AppDir/usr/bin/yuzu-cmd AppDir/usr/bin/yuzu-tester
34 34
35# Download tools needed to build an AppImage 35# Download tools needed to build an AppImage
36wget -nc https://github.com/yuzu-emu/ext-linux-bin/raw/main/appimage/linuxdeploy-x86_64.AppImage 36wget -nc https://raw.githubusercontent.com/lat9nq/deploy/main/linux/deploy-linux.sh
37wget -nc https://github.com/yuzu-emu/ext-linux-bin/raw/main/appimage/linuxdeploy-plugin-qt-x86_64.AppImage
38wget -nc https://raw.githubusercontent.com/yuzu-emu/AppImageKit-checkrt/old/AppRun.sh 37wget -nc https://raw.githubusercontent.com/yuzu-emu/AppImageKit-checkrt/old/AppRun.sh
39wget -nc https://github.com/yuzu-emu/ext-linux-bin/raw/main/appimage/exec-x86_64.so 38wget -nc https://github.com/yuzu-emu/ext-linux-bin/raw/main/appimage/exec-x86_64.so
40# Set executable bit 39# Set executable bit
41chmod 755 \ 40chmod 755 \
41 deploy-linux.sh \
42 AppRun.sh \ 42 AppRun.sh \
43 exec-x86_64.so \ 43 exec-x86_64.so \
44 linuxdeploy-x86_64.AppImage \
45 linuxdeploy-plugin-qt-x86_64.AppImage
46 44
47# Workaround for https://github.com/AppImage/AppImageKit/issues/828 45# Workaround for https://github.com/AppImage/AppImageKit/issues/828
48export APPIMAGE_EXTRACT_AND_RUN=1 46export APPIMAGE_EXTRACT_AND_RUN=1
@@ -52,7 +50,7 @@ mkdir -p AppDir/usr/optional/libstdc++
52mkdir -p AppDir/usr/optional/libgcc_s 50mkdir -p AppDir/usr/optional/libgcc_s
53 51
54# Deploy yuzu's needed dependencies 52# Deploy yuzu's needed dependencies
55./linuxdeploy-x86_64.AppImage --appdir AppDir --plugin qt 53DEPLOY_QT=1 ./deploy-linux.sh AppDir/usr/bin/yuzu AppDir
56 54
57# Workaround for libQt5MultimediaGstTools indirectly requiring libwayland-client and breaking Vulkan usage on end-user systems 55# Workaround for libQt5MultimediaGstTools indirectly requiring libwayland-client and breaking Vulkan usage on end-user systems
58find AppDir -type f -regex '.*libwayland-client\.so.*' -delete -print 56find AppDir -type f -regex '.*libwayland-client\.so.*' -delete -print