diff options
author | bunnei <bunneidev@gmail.com> | 2019-05-01 01:25:53 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-01 01:25:53 +0200 |
commit | fb420358a99fb4a27cb48fd0e21c5c3f3a477c0c (patch) | |
tree | 9912969d87ca50de573ca73d69e9560dfcf02121 | |
parent | Merge pull request #2100 from FreddyFunk/disk-cache-precompiled-file (diff) | |
parent | GenerateSCMRev: fix Travis compilation on repo forks (diff) | |
download | yuzu-fb420358a99fb4a27cb48fd0e21c5c3f3a477c0c.tar yuzu-fb420358a99fb4a27cb48fd0e21c5c3f3a477c0c.tar.gz yuzu-fb420358a99fb4a27cb48fd0e21c5c3f3a477c0c.tar.bz2 yuzu-fb420358a99fb4a27cb48fd0e21c5c3f3a477c0c.tar.lz yuzu-fb420358a99fb4a27cb48fd0e21c5c3f3a477c0c.tar.xz yuzu-fb420358a99fb4a27cb48fd0e21c5c3f3a477c0c.tar.zst yuzu-fb420358a99fb4a27cb48fd0e21c5c3f3a477c0c.zip |
-rwxr-xr-x | .travis/linux-mingw/build.sh | 2 | ||||
-rwxr-xr-x | .travis/linux-mingw/deps.sh | 2 | ||||
-rwxr-xr-x | .travis/linux-mingw/docker.sh | 10 | ||||
-rwxr-xr-x | .travis/linux/build.sh | 2 | ||||
-rwxr-xr-x | .travis/linux/deps.sh | 2 | ||||
-rwxr-xr-x | .travis/linux/docker.sh | 3 | ||||
-rw-r--r-- | CMakeModules/GenerateSCMRev.cmake | 2 |
7 files changed, 5 insertions, 18 deletions
diff --git a/.travis/linux-mingw/build.sh b/.travis/linux-mingw/build.sh index be03cc0f3..b12d70b12 100755 --- a/.travis/linux-mingw/build.sh +++ b/.travis/linux-mingw/build.sh @@ -1,3 +1,3 @@ #!/bin/bash -ex mkdir "$HOME/.ccache" || true -docker run --env-file .travis/common/travis-ci.env -v $(pwd):/yuzu -v "$HOME/.ccache":/root/.ccache ubuntu:18.04 /bin/bash -ex /yuzu/.travis/linux-mingw/docker.sh +docker run --env-file .travis/common/travis-ci.env -v $(pwd):/yuzu -v "$HOME/.ccache":/root/.ccache yuzuemu/build-environments:linux-mingw /bin/bash -ex /yuzu/.travis/linux-mingw/docker.sh diff --git a/.travis/linux-mingw/deps.sh b/.travis/linux-mingw/deps.sh index 540bb934a..55b5d6006 100755 --- a/.travis/linux-mingw/deps.sh +++ b/.travis/linux-mingw/deps.sh @@ -1,3 +1,3 @@ #!/bin/sh -ex -docker pull ubuntu:18.04 +docker pull yuzuemu/build-environments:linux-mingw diff --git a/.travis/linux-mingw/docker.sh b/.travis/linux-mingw/docker.sh index 6cf43a006..b73a28693 100755 --- a/.travis/linux-mingw/docker.sh +++ b/.travis/linux-mingw/docker.sh @@ -1,16 +1,6 @@ #!/bin/bash -ex cd /yuzu -MINGW_PACKAGES="sdl2-mingw-w64 qt5base-mingw-w64 qt5tools-mingw-w64 libsamplerate-mingw-w64 qt5multimedia-mingw-w64" -apt-get update -apt-get install -y gpg wget git python3-pip python ccache g++-mingw-w64-x86-64 gcc-mingw-w64-x86-64 mingw-w64-tools cmake -echo 'deb http://ppa.launchpad.net/tobydox/mingw-w64/ubuntu bionic main ' > /etc/apt/sources.list.d/extras.list -apt-key adv --keyserver keyserver.ubuntu.com --recv '72931B477E22FEFD47F8DECE02FE5F12ADDE29B2' -apt-get update -apt-get install -y ${MINGW_PACKAGES} - -# fix a problem in current MinGW headers -wget -q https://raw.githubusercontent.com/Alexpux/mingw-w64/d0d7f784833bbb0b2d279310ddc6afb52fe47a46/mingw-w64-headers/crt/errno.h -O /usr/x86_64-w64-mingw32/include/errno.h # override Travis CI unreasonable ccache size echo 'max_size = 3.0G' > "$HOME/.ccache/ccache.conf" 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 diff --git a/CMakeModules/GenerateSCMRev.cmake b/CMakeModules/GenerateSCMRev.cmake index 08315a1f1..5e00d839f 100644 --- a/CMakeModules/GenerateSCMRev.cmake +++ b/CMakeModules/GenerateSCMRev.cmake @@ -19,7 +19,7 @@ set(BUILD_VERSION "0") if (BUILD_REPOSITORY) # regex capture the string nightly or canary into CMAKE_MATCH_1 string(REGEX MATCH "yuzu-emu/yuzu-?(.*)" OUTVAR ${BUILD_REPOSITORY}) - if (${CMAKE_MATCH_COUNT} GREATER 0) + if ("${CMAKE_MATCH_COUNT}" GREATER 0) # capitalize the first letter of each word in the repo name. string(REPLACE "-" ";" REPO_NAME_LIST ${CMAKE_MATCH_1}) foreach(WORD ${REPO_NAME_LIST}) |