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/clang | |
| 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/clang/docker.sh | 6 | ||||
| -rw-r--r-- | .ci/scripts/clang/exec.sh | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | .ci/scripts/clang/upload.sh | 0 |
3 files changed, 3 insertions, 5 deletions
diff --git a/.ci/scripts/clang/docker.sh b/.ci/scripts/clang/docker.sh index 885d74e97..94a9ca0ec 100755 --- a/.ci/scripts/clang/docker.sh +++ b/.ci/scripts/clang/docker.sh @@ -3,14 +3,12 @@ # Exit on error, rather than continuing with the rest of the script. set -e -cd /yuzu - 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/clang/exec.sh b/.ci/scripts/clang/exec.sh index e56cd4325..a213aac27 100644 --- a/.ci/scripts/clang/exec.sh +++ b/.ci/scripts/clang/exec.sh @@ -4,5 +4,5 @@ mkdir -p "ccache" || true chmod a+x ./.ci/scripts/clang/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/clang/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/clang/docker.sh "$1" sudo chown -R $UID ./ diff --git a/.ci/scripts/clang/upload.sh b/.ci/scripts/clang/upload.sh index fe4e6b2ac..fe4e6b2ac 100644..100755 --- a/.ci/scripts/clang/upload.sh +++ b/.ci/scripts/clang/upload.sh |