From a1815b617ceebf9a0a43c6fb89a13ac7f37f9ba4 Mon Sep 17 00:00:00 2001
From: liushuyu
Date: Wed, 22 Dec 2021 23:31:57 -0700
Subject: CI: Use GitHub Actions to check pull requests

---
 .ci/scripts/linux/docker.sh | 2 --
 1 file changed, 2 deletions(-)

(limited to '.ci/scripts/linux/docker.sh')

diff --git a/.ci/scripts/linux/docker.sh b/.ci/scripts/linux/docker.sh
index 5070b92d1..38b29294c 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
-- 
cgit v1.2.3


From 43a1948d5807469b5ddcea0e3f69b5659171d742 Mon Sep 17 00:00:00 2001
From: liushuyu
Date: Thu, 23 Dec 2021 04:43:24 -0700
Subject: CI: use Ninja to build stuff faster

---
 .ci/scripts/linux/docker.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to '.ci/scripts/linux/docker.sh')

diff --git a/.ci/scripts/linux/docker.sh b/.ci/scripts/linux/docker.sh
index 38b29294c..436155b3d 100755
--- a/.ci/scripts/linux/docker.sh
+++ b/.ci/scripts/linux/docker.sh
@@ -17,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
-- 
cgit v1.2.3