diff options
author | liushuyu <liushuyu011@gmail.com> | 2018-08-07 16:54:57 +0200 |
---|---|---|
committer | fearlessTobi <thm.frey@gmail.com> | 2019-04-15 22:22:09 +0200 |
commit | a9f58593d4ac951bf15993bd280d6b2d78b3fdee (patch) | |
tree | a9635dad69c99b3d0afa5572d836fdaa8076b83c /.travis/linux | |
parent | Merge pull request #2378 from lioncash/ro (diff) | |
download | yuzu-a9f58593d4ac951bf15993bd280d6b2d78b3fdee.tar yuzu-a9f58593d4ac951bf15993bd280d6b2d78b3fdee.tar.gz yuzu-a9f58593d4ac951bf15993bd280d6b2d78b3fdee.tar.bz2 yuzu-a9f58593d4ac951bf15993bd280d6b2d78b3fdee.tar.lz yuzu-a9f58593d4ac951bf15993bd280d6b2d78b3fdee.tar.xz yuzu-a9f58593d4ac951bf15993bd280d6b2d78b3fdee.tar.zst yuzu-a9f58593d4ac951bf15993bd280d6b2d78b3fdee.zip |
Diffstat (limited to '.travis/linux')
-rwxr-xr-x | .travis/linux/build.sh | 2 | ||||
-rwxr-xr-x | .travis/linux/deps.sh | 2 | ||||
-rwxr-xr-x | .travis/linux/docker.sh | 3 |
3 files changed, 2 insertions, 5 deletions
diff --git a/.travis/linux/build.sh b/.travis/linux/build.sh index 2fced727d..3929f97fc 100755 --- a/.travis/linux/build.sh +++ b/.travis/linux/build.sh @@ -1,4 +1,4 @@ #!/bin/bash -ex mkdir -p "$HOME/.ccache" -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 +docker run -e ENABLE_COMPATIBILITY_REPORTING --env-file .travis/common/travis-ci.env -v $(pwd):/yuzu -v "$HOME/.ccache":/root/.ccache yuzuemu/build-environments:linux-fresh /bin/bash /yuzu/.travis/linux/docker.sh diff --git a/.travis/linux/deps.sh b/.travis/linux/deps.sh index 540bb934a..8d23c517d 100755 --- a/.travis/linux/deps.sh +++ b/.travis/linux/deps.sh @@ -1,3 +1,3 @@ #!/bin/sh -ex -docker pull ubuntu:18.04 +docker pull yuzuemu/build-environments:linux-fresh diff --git a/.travis/linux/docker.sh b/.travis/linux/docker.sh index 8b7e65911..a21a8f9e2 100755 --- a/.travis/linux/docker.sh +++ b/.travis/linux/docker.sh @@ -1,8 +1,5 @@ #!/bin/bash -ex -apt-get update -apt-get install --no-install-recommends -y build-essential git libqt5opengl5-dev libsdl2-dev libssl-dev python qtbase5-dev qtwebengine5-dev wget cmake ninja-build ccache - cd /yuzu mkdir build && cd build |