diff options
| author | MerryMage <MerryMage@users.noreply.github.com> | 2018-01-13 22:37:06 +0100 |
|---|---|---|
| committer | MerryMage <MerryMage@users.noreply.github.com> | 2018-01-13 23:38:47 +0100 |
| commit | f95789a0b3f881a17d854534244ad380389d0cb1 (patch) | |
| tree | 25e233f7fb4624e7b0d62a5b64534f766e4e3f02 /.travis/linux | |
| parent | yuzu: Update CONTRIBUTING.md. (diff) | |
| download | yuzu-f95789a0b3f881a17d854534244ad380389d0cb1.tar yuzu-f95789a0b3f881a17d854534244ad380389d0cb1.tar.gz yuzu-f95789a0b3f881a17d854534244ad380389d0cb1.tar.bz2 yuzu-f95789a0b3f881a17d854534244ad380389d0cb1.tar.lz yuzu-f95789a0b3f881a17d854534244ad380389d0cb1.tar.xz yuzu-f95789a0b3f881a17d854534244ad380389d0cb1.tar.zst yuzu-f95789a0b3f881a17d854534244ad380389d0cb1.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 | 17 | ||||
| -rwxr-xr-x | .travis/linux/upload.sh | 6 |
4 files changed, 16 insertions, 11 deletions
diff --git a/.travis/linux/build.sh b/.travis/linux/build.sh index 98433d184..bea898171 100755 --- a/.travis/linux/build.sh +++ b/.travis/linux/build.sh @@ -1,3 +1,3 @@ #!/bin/bash -ex -docker run -v $(pwd):/citra ubuntu:16.04 /bin/bash /citra/.travis/linux/docker.sh +docker run -v $(pwd):/yuzu ubuntu:18.04 /bin/bash /yuzu/.travis/linux/docker.sh diff --git a/.travis/linux/deps.sh b/.travis/linux/deps.sh index be3f6bece..540bb934a 100755 --- a/.travis/linux/deps.sh +++ b/.travis/linux/deps.sh @@ -1,3 +1,3 @@ #!/bin/sh -ex -docker pull ubuntu:16.04 +docker pull ubuntu:18.04 diff --git a/.travis/linux/docker.sh b/.travis/linux/docker.sh index e27af5600..a85225c5a 100755 --- a/.travis/linux/docker.sh +++ b/.travis/linux/docker.sh @@ -1,14 +1,19 @@ #!/bin/bash -ex -cd /citra - apt-get update -apt-get install -y build-essential libsdl2-dev qtbase5-dev libqt5opengl5-dev libcurl4-openssl-dev libssl-dev wget git +apt-get install -y build-essential git libcurl4-openssl-dev libqt5opengl5-dev libsdl2-dev libssl-dev python qtbase5-dev wget # Get a recent version of CMake -wget https://cmake.org/files/v3.9/cmake-3.9.0-Linux-x86_64.sh -echo y | sh cmake-3.9.0-Linux-x86_64.sh --prefix=cmake -export PATH=/citra/cmake/cmake-3.9.0-Linux-x86_64/bin:$PATH +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 + +mkdir /unicorn +cd /unicorn +git clone https://github.com/yuzu-emu/unicorn . +UNICORN_ARCHS=aarch64 ./make.sh +./make.sh install + +cd /yuzu mkdir build && cd build cmake .. -DUSE_SYSTEM_CURL=ON -DCMAKE_BUILD_TYPE=Release diff --git a/.travis/linux/upload.sh b/.travis/linux/upload.sh index dd265e0fd..8a029bbe2 100755 --- a/.travis/linux/upload.sh +++ b/.travis/linux/upload.sh @@ -2,13 +2,13 @@ . .travis/common/pre-upload.sh -REV_NAME="citra-linux-${GITDATE}-${GITREV}" +REV_NAME="yuzu-linux-${GITDATE}-${GITREV}" ARCHIVE_NAME="${REV_NAME}.tar.xz" COMPRESSION_FLAGS="-cJvf" mkdir "$REV_NAME" -cp build/src/citra/citra "$REV_NAME" -cp build/src/citra_qt/citra-qt "$REV_NAME" +cp build/src/yuzu_cmd/yuzu-cmd "$REV_NAME" +cp build/src/yuzu/yuzu "$REV_NAME" . .travis/common/post-upload.sh |