summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-09-01 03:50:44 +0200
committerGitHub <noreply@github.com>2018-09-01 03:50:44 +0200
commitc69dc5acf9faf3817337dfd5883fd3ef55a73326 (patch)
tree5145101b78f4e3b2fa09b101080f32a300dbaf55
parentMerge pull request #1212 from lioncash/forward-decl (diff)
parenttravis: use Citras ccache (diff)
downloadyuzu-c69dc5acf9faf3817337dfd5883fd3ef55a73326.tar
yuzu-c69dc5acf9faf3817337dfd5883fd3ef55a73326.tar.gz
yuzu-c69dc5acf9faf3817337dfd5883fd3ef55a73326.tar.bz2
yuzu-c69dc5acf9faf3817337dfd5883fd3ef55a73326.tar.lz
yuzu-c69dc5acf9faf3817337dfd5883fd3ef55a73326.tar.xz
yuzu-c69dc5acf9faf3817337dfd5883fd3ef55a73326.tar.zst
yuzu-c69dc5acf9faf3817337dfd5883fd3ef55a73326.zip
-rw-r--r--.travis.yml6
-rwxr-xr-x.travis/linux/build.sh3
-rwxr-xr-x.travis/linux/docker.sh8
-rwxr-xr-x.travis/macos/build.sh5
4 files changed, 6 insertions, 16 deletions
diff --git a/.travis.yml b/.travis.yml
index c225d4a2c..dee34a8e3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,6 +20,7 @@ matrix:
install: "./.travis/linux/deps.sh"
script: "./.travis/linux/build.sh"
after_success: "./.travis/linux/upload.sh"
+ cache: ccache
- os: osx
env: NAME="macos build"
sudo: false
@@ -27,6 +28,7 @@ matrix:
install: "./.travis/macos/deps.sh"
script: "./.travis/macos/build.sh"
after_success: "./.travis/macos/upload.sh"
+ cache: ccache
deploy:
provider: releases
@@ -42,7 +44,3 @@ notifications:
webhooks:
urls:
- https://api.yuzu-emu.org/code/travis/notify
-
-cache:
- directories:
- - $HOME/.ccache
diff --git a/.travis/linux/build.sh b/.travis/linux/build.sh
index 43b806510..c3a1f93e4 100755
--- a/.travis/linux/build.sh
+++ b/.travis/linux/build.sh
@@ -1,3 +1,4 @@
#!/bin/bash -ex
-docker run -e CCACHE_DIR=/ccache -v $HOME/.ccache:/ccache --env-file .travis/common/travis-ci.env -v $(pwd):/yuzu ubuntu:18.04 /bin/bash /yuzu/.travis/linux/docker.sh
+mkdir -p "$HOME/.ccache"
+docker run --env-file .travis/common/travis-ci.env -v $(pwd):/yuzu -v "$HOME/.ccache":/root/.ccache ubuntu:18.04 /bin/bash /yuzu/.travis/linux/docker.sh
diff --git a/.travis/linux/docker.sh b/.travis/linux/docker.sh
index d13ca50d8..459d6bc75 100755
--- a/.travis/linux/docker.sh
+++ b/.travis/linux/docker.sh
@@ -5,14 +5,8 @@ apt-get install --no-install-recommends -y build-essential git libqt5opengl5-dev
cd /yuzu
-export PATH=/usr/lib/ccache:$PATH
-ln -sf /usr/bin/ccache /usr/lib/ccache/cc
-ln -sf /usr/bin/ccache /usr/lib/ccache/c++
mkdir build && cd build
-ccache --show-stats > ccache_before
-cmake .. -DYUZU_BUILD_UNICORN=ON -DCMAKE_BUILD_TYPE=Release -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -G Ninja
+cmake .. -DYUZU_BUILD_UNICORN=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=/usr/lib/ccache/gcc -DCMAKE_CXX_COMPILER=/usr/lib/ccache/g++ -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -G Ninja
ninja
-ccache --show-stats > ccache_after
-diff -U100 ccache_before ccache_after || true
ctest -VV -C Release
diff --git a/.travis/macos/build.sh b/.travis/macos/build.sh
index d32340b7c..b76a153be 100755
--- a/.travis/macos/build.sh
+++ b/.travis/macos/build.sh
@@ -5,14 +5,11 @@ set -o pipefail
export MACOSX_DEPLOYMENT_TARGET=10.12
export Qt5_DIR=$(brew --prefix)/opt/qt5
export UNICORNDIR=$(pwd)/externals/unicorn
+export PATH="/usr/local/opt/ccache/libexec:$PATH"
mkdir build && cd build
-export PATH=/usr/local/opt/ccache/libexec:$PATH
-ccache --show-stats > ccache_before
cmake --version
cmake .. -DYUZU_BUILD_UNICORN=ON -DCMAKE_BUILD_TYPE=Release -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON
make -j4
-ccache --show-stats > ccache_after
-diff -U100 ccache_before ccache_after || true
ctest -VV -C Release