diff options
| author | James <jselby@jselby.net> | 2017-08-04 12:11:47 +0200 |
|---|---|---|
| committer | James <jselby@jselby.net> | 2017-08-10 12:13:59 +0200 |
| commit | fa64309aace2b782029ef599d20e8e0f1dd72a83 (patch) | |
| tree | 987e0c199f24dec24f64d3a1d6403b09215a2b71 /.travis-build.sh | |
| parent | Merge pull request #2868 from wwylele/swr-tuple (diff) | |
| download | yuzu-fa64309aace2b782029ef599d20e8e0f1dd72a83.tar yuzu-fa64309aace2b782029ef599d20e8e0f1dd72a83.tar.gz yuzu-fa64309aace2b782029ef599d20e8e0f1dd72a83.tar.bz2 yuzu-fa64309aace2b782029ef599d20e8e0f1dd72a83.tar.lz yuzu-fa64309aace2b782029ef599d20e8e0f1dd72a83.tar.xz yuzu-fa64309aace2b782029ef599d20e8e0f1dd72a83.tar.zst yuzu-fa64309aace2b782029ef599d20e8e0f1dd72a83.zip | |
Diffstat (limited to '.travis-build.sh')
| -rwxr-xr-x | .travis-build.sh | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/.travis-build.sh b/.travis-build.sh index df6e236b6..64f5aed94 100755 --- a/.travis-build.sh +++ b/.travis-build.sh @@ -44,15 +44,7 @@ fi #if OS is linux or is not set if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then - export CC=gcc-6 - export CXX=g++-6 - export PKG_CONFIG_PATH=$HOME/.local/lib/pkgconfig:$PKG_CONFIG_PATH - - mkdir build && cd build - cmake .. - make -j4 - - ctest -VV -C Release + docker run -v $(pwd):/citra ubuntu:16.04 /bin/bash /citra/.travis-build-docker.sh elif [ "$TRAVIS_OS_NAME" = "osx" ]; then set -o pipefail |