diff options
| -rw-r--r-- | .travis-build-docker.sh | 20 | ||||
| -rwxr-xr-x | .travis-build.sh | 10 | ||||
| -rwxr-xr-x | .travis-deps.sh | 30 | ||||
| -rwxr-xr-x | .travis-upload.sh | 11 | ||||
| -rw-r--r-- | .travis.yml | 16 | ||||
| -rw-r--r-- | appveyor.yml | 20 |
6 files changed, 49 insertions, 58 deletions
diff --git a/.travis-build-docker.sh b/.travis-build-docker.sh new file mode 100644 index 000000000..ca6fae42b --- /dev/null +++ b/.travis-build-docker.sh @@ -0,0 +1,20 @@ +#!/bin/sh + +set -e +set -x + +cd /citra + +apt-get update +apt-get install -y build-essential libsdl2-dev qtbase5-dev libqt5opengl5-dev libcurl4-openssl-dev libssl-dev wget git + +# 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 + +mkdir build && cd build +cmake .. -DCMAKE_BUILD_TYPE=Release +make -j4 + +ctest -VV -C Release 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 diff --git a/.travis-deps.sh b/.travis-deps.sh index 25a287c7f..0cee68041 100755 --- a/.travis-deps.sh +++ b/.travis-deps.sh @@ -5,35 +5,7 @@ set -x #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 - mkdir -p $HOME/.local - - if [ ! -e $HOME/.local/bin/cmake ]; then - echo "CMake not found in the cache, get and extract it..." - curl -L http://www.cmake.org/files/v3.6/cmake-3.6.3-Linux-x86_64.tar.gz \ - | tar -xz -C $HOME/.local --strip-components=1 - else - echo "Using cached CMake" - fi - - if [ ! -e $HOME/.local/lib/libSDL2.la ]; then - echo "SDL2 not found in cache, get and build it..." - wget http://libsdl.org/release/SDL2-2.0.5.tar.gz -O - | tar xz - cd SDL2-2.0.5 - ./configure --prefix=$HOME/.local - make -j4 && make install - else - echo "Using cached SDL2" - fi - - export DEBIAN_FRONTEND=noninteractive - # Amazing placebo security - curl http://apt.llvm.org/llvm-snapshot.gpg.key | sudo -E apt-key add - - sudo -E add-apt-repository "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-3.9 main" - sudo -E apt-get -yq update - sudo -E apt-get -yq install clang-format-3.9 - + docker pull ubuntu:16.04 elif [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update brew install qt5 sdl2 dylibbundler p7zip diff --git a/.travis-upload.sh b/.travis-upload.sh index 17959b0e1..8c1fa21c5 100755 --- a/.travis-upload.sh +++ b/.travis-upload.sh @@ -123,9 +123,16 @@ cp README.md "$REV_NAME" tar $COMPRESSION_FLAGS "$ARCHIVE_NAME" "$REV_NAME" -mv "$REV_NAME" nightly +# Find out what release we are building +if [ -z $TRAVIS_TAG ]; then + RELEASE_NAME=head +else + RELEASE_NAME=$(echo $TRAVIS_TAG | cut -d- -f1) +fi + +mv "$REV_NAME" $RELEASE_NAME -7z a "$REV_NAME.7z" nightly +7z a "$REV_NAME.7z" $RELEASE_NAME # move the compiled archive into the artifacts directory to be uploaded by travis releases mv "$ARCHIVE_NAME" artifacts/ diff --git a/.travis.yml b/.travis.yml index 3da22eb5d..b92d7f236 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,23 +8,15 @@ matrix: sudo: false osx_image: xcode7.3 +services: + - docker + addons: apt: - sources: - - ubuntu-toolchain-r-test packages: - - gcc-6 - - g++-6 - - qt5-default - - libqt5opengl5-dev - - xorg-dev - - lib32stdc++6 # For CMake + - clang-format-3.9 - p7zip-full -cache: - directories: - - "$HOME/.local" - install: "./.travis-deps.sh" script: "./.travis-build.sh" after_success: "./.travis-upload.sh" diff --git a/appveyor.yml b/appveyor.yml index eb4e7df87..94e9969f5 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -46,13 +46,21 @@ after_build: 7z a -tzip $MSVC_BUILD_PDB .\build\bin\release\*.pdb rm .\build\bin\release\*.pdb - mkdir nightly - Copy-Item .\build\bin\release\* -Destination nightly -Recurse - Copy-Item .\license.txt -Destination nightly - Copy-Item .\README.md -Destination nightly + # Find out which kind of release we are producing by tag name + if ($env:APPVEYOR_REPO_TAG_NAME) { + $RELEASE_DIST, $RELEASE_VERSION = $env:APPVEYOR_REPO_TAG_NAME.split('-') + } else { + # There is no repo tag - make assumptions + $RELEASE_DIST = "head" + } - 7z a -tzip $MSVC_BUILD_NAME nightly\* - 7z a $MSVC_SEVENZIP nightly + mkdir $RELEASE_DIST + Copy-Item .\build\bin\release\* -Destination $RELEASE_DIST -Recurse + Copy-Item .\license.txt -Destination $RELEASE_DIST + Copy-Item .\README.md -Destination $RELEASE_DIST + + 7z a -tzip $MSVC_BUILD_NAME $RELEASE_DIST\* + 7z a $MSVC_SEVENZIP $RELEASE_DIST test_script: - cd build && ctest -VV -C Release && cd .. |