From 43a1948d5807469b5ddcea0e3f69b5659171d742 Mon Sep 17 00:00:00 2001
From: liushuyu <liushuyu011@gmail.com>
Date: Thu, 23 Dec 2021 04:43:24 -0700
Subject: [PATCH] CI: use Ninja to build stuff faster
---
.ci/scripts/clang/docker.sh | 4 ++--
.ci/scripts/linux/docker.sh | 7 ++++---
.ci/scripts/windows/docker.sh | 6 +++---
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/.ci/scripts/clang/docker.sh b/.ci/scripts/clang/docker.sh
index 4bb07105a..94a9ca0ec 100755
--- a/.ci/scripts/clang/docker.sh
+++ b/.ci/scripts/clang/docker.sh
@@ -6,9 +6,9 @@ set -e
ccache -s
mkdir build || true && cd build
-cmake .. -DDISPLAY_VERSION=$1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=/usr/lib/ccache/clang -DCMAKE_CXX_COMPILER=/usr/lib/ccache/clang++ -DYUZU_ENABLE_COMPATIBILITY_REPORTING=${ENABLE_COMPATIBILITY_REPORTING:-"OFF"} -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DUSE_DISCORD_PRESENCE=ON -DENABLE_QT_TRANSLATION=ON -DCMAKE_INSTALL_PREFIX="/usr"
+cmake .. -GNinja -DDISPLAY_VERSION=$1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=/usr/lib/ccache/clang -DCMAKE_CXX_COMPILER=/usr/lib/ccache/clang++ -DYUZU_ENABLE_COMPATIBILITY_REPORTING=${ENABLE_COMPATIBILITY_REPORTING:-"OFF"} -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DUSE_DISCORD_PRESENCE=ON -DENABLE_QT_TRANSLATION=ON -DCMAKE_INSTALL_PREFIX="/usr"
-make -j$(nproc)
+ninja
ccache -s
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
diff --git a/.ci/scripts/windows/docker.sh b/.ci/scripts/windows/docker.sh
index 6420c8f7d..46cdb68f5 100755
--- a/.ci/scripts/windows/docker.sh
+++ b/.ci/scripts/windows/docker.sh
@@ -6,9 +6,9 @@ set -e
ccache -s
-mkdir -p "$HOME/.conan/"
-cp -rv /home/yuzu/.conan/profiles/ "$HOME/.conan/"
-cp -rv /home/yuzu/.conan/settings.yml "$HOME/.conan/"
+mkdir -p "$HOME/.conan/profiles"
+wget -nc "https://github.com/yuzu-emu/build-environments/raw/master/linux-mingw/default" -O "$HOME/.conan/profiles/default"
+wget -nc "https://github.com/yuzu-emu/build-environments/raw/master/linux-mingw/settings.yml" -O "$HOME/.conan/settings.yml"
mkdir -p build && cd build
export LDFLAGS="-fuse-ld=lld"