diff options
| author | fearlessTobi <thm.frey@gmail.com> | 2018-09-16 20:05:51 +0200 |
|---|---|---|
| committer | fearlessTobi <thm.frey@gmail.com> | 2018-10-02 15:30:48 +0200 |
| commit | 4d139943f2407144d5f8e3dc5a673f24850d43d0 (patch) | |
| tree | be24285a32c2b72b9756b69fd614f3d45c70ff41 /.travis | |
| parent | Add submodules (diff) | |
| download | yuzu-4d139943f2407144d5f8e3dc5a673f24850d43d0.tar yuzu-4d139943f2407144d5f8e3dc5a673f24850d43d0.tar.gz yuzu-4d139943f2407144d5f8e3dc5a673f24850d43d0.tar.bz2 yuzu-4d139943f2407144d5f8e3dc5a673f24850d43d0.tar.lz yuzu-4d139943f2407144d5f8e3dc5a673f24850d43d0.tar.xz yuzu-4d139943f2407144d5f8e3dc5a673f24850d43d0.tar.zst yuzu-4d139943f2407144d5f8e3dc5a673f24850d43d0.zip | |
Diffstat (limited to '')
| -rw-r--r-- | .travis/common/travis-ci.env | 4 | ||||
| -rwxr-xr-x | .travis/linux/build.sh | 2 | ||||
| -rwxr-xr-x | .travis/linux/docker.sh | 2 | ||||
| -rwxr-xr-x | .travis/macos/build.sh | 2 |
4 files changed, 7 insertions, 3 deletions
diff --git a/.travis/common/travis-ci.env b/.travis/common/travis-ci.env index a333786ce..ec8e2dd63 100644 --- a/.travis/common/travis-ci.env +++ b/.travis/common/travis-ci.env @@ -10,3 +10,7 @@ TRAVIS_JOB_ID TRAVIS_JOB_NUMBER TRAVIS_REPO_SLUG TRAVIS_TAG + +# yuzu specific flags +ENABLE_COMPATIBILITY_REPORTING +USE_DISCORD_PRESENCE diff --git a/.travis/linux/build.sh b/.travis/linux/build.sh index c3a1f93e4..2fced727d 100755 --- a/.travis/linux/build.sh +++ b/.travis/linux/build.sh @@ -1,4 +1,4 @@ #!/bin/bash -ex 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 +docker run -e ENABLE_COMPATIBILITY_REPORTING --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 892d2480a..4fe3326f9 100755 --- a/.travis/linux/docker.sh +++ b/.travis/linux/docker.sh @@ -6,7 +6,7 @@ apt-get install --no-install-recommends -y build-essential git libqt5opengl5-dev cd /yuzu mkdir build && cd build -cmake .. -DYUZU_USE_BUNDLED_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 +cmake .. -DYUZU_USE_BUNDLED_UNICORN=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=/usr/lib/ccache/gcc -DCMAKE_CXX_COMPILER=/usr/lib/ccache/g++ -DYUZU_ENABLE_COMPATIBILITY_REPORTING=${ENABLE_COMPATIBILITY_REPORTING:-"OFF"} -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DUSE_DISCORD_PRESENCE=ON -G Ninja ninja ccache -s diff --git a/.travis/macos/build.sh b/.travis/macos/build.sh index e68dc1400..dce12099b 100755 --- a/.travis/macos/build.sh +++ b/.travis/macos/build.sh @@ -9,7 +9,7 @@ export PATH="/usr/local/opt/ccache/libexec:$PATH" mkdir build && cd build cmake --version -cmake .. -DYUZU_USE_BUNDLED_UNICORN=ON -DCMAKE_BUILD_TYPE=Release -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON +cmake .. -DYUZU_USE_BUNDLED_UNICORN=ON -DCMAKE_BUILD_TYPE=Release -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DYUZU_ENABLE_COMPATIBILITY_REPORTING=${ENABLE_COMPATIBILITY_REPORTING:-"OFF"} -DUSE_DISCORD_PRESENCE=ON make -j4 ccache -s |