diff options
| author | bunnei <bunneidev@gmail.com> | 2019-04-30 19:25:53 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-30 19:25:53 -0400 |
| commit | fb420358a99fb4a27cb48fd0e21c5c3f3a477c0c (patch) | |
| tree | 9912969d87ca50de573ca73d69e9560dfcf02121 /.travis/linux | |
| parent | 79e54abe1917b23ea357ab660ea386994dfd299d (diff) | |
| parent | b67be7154d5dd46252d60b15774d0cfa689ed01e (diff) | |
Merge pull request #2406 from FearlessTobi/port-3839
Port citra-emu/citra#3839: "travis: use prebuilt image"
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 |