diff options
author | Morph <39850852+Morph1984@users.noreply.github.com> | 2022-07-06 02:30:38 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-07-06 02:30:38 +0200 |
commit | 770611fdf39f274ee9ccde9875e86cfeb79a3f6f (patch) | |
tree | a580077f3b8f5ebbba6ee58ba594192f68ebdeea /.ci/scripts/linux | |
parent | Merge pull request #8532 from liamwhite/fiber-supplements (diff) | |
parent | CI: unbreak ADO after GHA changes (diff) | |
download | yuzu-770611fdf39f274ee9ccde9875e86cfeb79a3f6f.tar yuzu-770611fdf39f274ee9ccde9875e86cfeb79a3f6f.tar.gz yuzu-770611fdf39f274ee9ccde9875e86cfeb79a3f6f.tar.bz2 yuzu-770611fdf39f274ee9ccde9875e86cfeb79a3f6f.tar.lz yuzu-770611fdf39f274ee9ccde9875e86cfeb79a3f6f.tar.xz yuzu-770611fdf39f274ee9ccde9875e86cfeb79a3f6f.tar.zst yuzu-770611fdf39f274ee9ccde9875e86cfeb79a3f6f.zip |
Diffstat (limited to '')
-rwxr-xr-x | .ci/scripts/linux/docker.sh | 9 | ||||
-rw-r--r-- | .ci/scripts/linux/exec.sh | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | .ci/scripts/linux/upload.sh | 5 |
3 files changed, 10 insertions, 6 deletions
diff --git a/.ci/scripts/linux/docker.sh b/.ci/scripts/linux/docker.sh index 5070b92d1..436155b3d 100755 --- a/.ci/scripts/linux/docker.sh +++ b/.ci/scripts/linux/docker.sh @@ -3,8 +3,6 @@ # Exit on error, rather than continuing with the rest of the script. set -e -cd /yuzu - ccache -s mkdir build || true && cd build @@ -19,15 +17,16 @@ cmake .. \ -DENABLE_QT_TRANSLATION=ON \ -DUSE_DISCORD_PRESENCE=ON \ -DYUZU_ENABLE_COMPATIBILITY_REPORTING=${ENABLE_COMPATIBILITY_REPORTING:-"OFF"} \ - -DYUZU_USE_BUNDLED_FFMPEG=ON + -DYUZU_USE_BUNDLED_FFMPEG=ON \ + -GNinja -make -j$(nproc) +ninja ccache -s ctest -VV -C Release -make install DESTDIR=AppDir +DESTDIR="$PWD/AppDir" ninja install rm -vf AppDir/usr/bin/yuzu-cmd AppDir/usr/bin/yuzu-tester # Download tools needed to build an AppImage diff --git a/.ci/scripts/linux/exec.sh b/.ci/scripts/linux/exec.sh index a7deddeb3..fc4594d65 100644 --- a/.ci/scripts/linux/exec.sh +++ b/.ci/scripts/linux/exec.sh @@ -4,5 +4,5 @@ mkdir -p "ccache" || true chmod a+x ./.ci/scripts/linux/docker.sh # the UID for the container yuzu user is 1027 sudo chown -R 1027 ./ -docker run -e ENABLE_COMPATIBILITY_REPORTING -e CCACHE_DIR=/yuzu/ccache -v $(pwd):/yuzu yuzuemu/build-environments:linux-fresh /bin/bash /yuzu/.ci/scripts/linux/docker.sh $1 +docker run -e ENABLE_COMPATIBILITY_REPORTING -e CCACHE_DIR=/yuzu/ccache -v "$(pwd):/yuzu" -w /yuzu yuzuemu/build-environments:linux-fresh /bin/bash /yuzu/.ci/scripts/linux/docker.sh "$1" sudo chown -R $UID ./ diff --git a/.ci/scripts/linux/upload.sh b/.ci/scripts/linux/upload.sh index 208cd0d04..3f2c2f208 100644..100755 --- a/.ci/scripts/linux/upload.sh +++ b/.ci/scripts/linux/upload.sh @@ -24,6 +24,11 @@ cd build wget -nc https://github.com/yuzu-emu/ext-linux-bin/raw/main/appimage/appimagetool-x86_64.AppImage chmod 755 appimagetool-x86_64.AppImage +# if FUSE is not available, then fallback to extract and run +if ! ./appimagetool-x86_64.AppImage --version; then + export APPIMAGE_EXTRACT_AND_RUN=1 +fi + if [ "${RELEASE_NAME}" = "mainline" ]; then # Generate update information if releasing to mainline ./appimagetool-x86_64.AppImage -u "gh-releases-zsync|yuzu-emu|yuzu-${RELEASE_NAME}|latest|yuzu-*.AppImage.zsync" AppDir "${APPIMAGE_NAME}" |