summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-06-09 00:51:59 +0200
committerGitHub <noreply@github.com>2018-06-09 00:51:59 +0200
commit83517cb53a61a36ed66f6f0cb5f787b507421066 (patch)
tree87ff9eeed34d528bd53179f6c9b6807b4f709b36
parentMerge pull request #533 from mailwl/array-to-buffer (diff)
parentCache ccache on Travis (diff)
downloadyuzu-83517cb53a61a36ed66f6f0cb5f787b507421066.tar
yuzu-83517cb53a61a36ed66f6f0cb5f787b507421066.tar.gz
yuzu-83517cb53a61a36ed66f6f0cb5f787b507421066.tar.bz2
yuzu-83517cb53a61a36ed66f6f0cb5f787b507421066.tar.lz
yuzu-83517cb53a61a36ed66f6f0cb5f787b507421066.tar.xz
yuzu-83517cb53a61a36ed66f6f0cb5f787b507421066.tar.zst
yuzu-83517cb53a61a36ed66f6f0cb5f787b507421066.zip
-rw-r--r--.travis.yml4
-rwxr-xr-x.travis/linux/build.sh2
-rwxr-xr-x.travis/linux/docker.sh12
-rwxr-xr-x.travis/macos/build.sh4
-rwxr-xr-x.travis/macos/deps.sh2
5 files changed, 17 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml
index 6740ea2cf..c225d4a2c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -42,3 +42,7 @@ 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 bea898171..213feb25b 100755
--- a/.travis/linux/build.sh
+++ b/.travis/linux/build.sh
@@ -1,3 +1,3 @@
#!/bin/bash -ex
-docker run -v $(pwd):/yuzu ubuntu:18.04 /bin/bash /yuzu/.travis/linux/docker.sh
+docker run -e CCACHE_DIR=/ccache -v $HOME/.ccache:/ccache -v $(pwd):/yuzu ubuntu:18.04 /bin/bash /yuzu/.travis/linux/docker.sh
diff --git a/.travis/linux/docker.sh b/.travis/linux/docker.sh
index bc541216c..376ad28dd 100755
--- a/.travis/linux/docker.sh
+++ b/.travis/linux/docker.sh
@@ -1,16 +1,18 @@
#!/bin/bash -ex
apt-get update
-apt-get install -y build-essential git libqt5opengl5-dev libsdl2-dev libssl-dev python qtbase5-dev wget ninja-build
-
-# Get a recent version of CMake
-wget https://cmake.org/files/v3.10/cmake-3.10.1-Linux-x86_64.sh
-sh cmake-3.10.1-Linux-x86_64.sh --exclude-subdir --prefix=/ --skip-license
+apt-get install --no-install-recommends -y build-essential git libqt5opengl5-dev libsdl2-dev libssl-dev python qtbase5-dev wget cmake ninja-build ccache
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 -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 f633f618f..5816b1d6e 100755
--- a/.travis/macos/build.sh
+++ b/.travis/macos/build.sh
@@ -7,8 +7,12 @@ export Qt5_DIR=$(brew --prefix)/opt/qt5
export UNICORNDIR=$(pwd)/externals/unicorn
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
make -j4
+ccache --show-stats > ccache_after
+diff -U100 ccache_before ccache_after || true
ctest -VV -C Release
diff --git a/.travis/macos/deps.sh b/.travis/macos/deps.sh
index 3cd13a39b..1a547c060 100755
--- a/.travis/macos/deps.sh
+++ b/.travis/macos/deps.sh
@@ -1,5 +1,5 @@
#!/bin/sh -ex
brew update
-brew install dylibbundler p7zip qt5 sdl2
+brew install dylibbundler p7zip qt5 sdl2 ccache
brew outdated cmake || brew upgrade cmake