widelands-dev team mailing list archive

[Hans Joachim Desserud <launchpad@xxxxxxxxxxxx>]

Ready for review :)

Diff comments:

> 
> === modified file '.travis.yml'
> --- .travis.yml	2017-05-03 18:55:33 +0000
> +++ .travis.yml	2017-07-17 11:07:46 +0000
> @@ -13,37 +13,66 @@
>    except:
>      - _widelands_dev_widelands_trunk
>  
> +# Let travis add additional repos and install packages for us (https://docs.travis-ci.com/user/migrating-from-legacy/#Adding-APT-Sources)
> +addons:
> +  apt:
> +    # The aliases used are based on a whitelist, see https://github.com/travis-ci/apt-source-whitelist for details. 
> +    # Clang 3.4 and 3.5 are too old (presumably) to have gotten official aliases
> +    sources:
> +      - ubuntu-toolchain-r-test
> +      - sourceline: "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-3.4 main"
> +        key_url: "http://apt.llvm.org/llvm-snapshot.gpg.key";
> +      - sourceline: "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-3.5 main"
> +        key_url: "http://apt.llvm.org/llvm-snapshot.gpg.key";
> +      - llvm-toolchain-trusty-3.9
> +      - llvm-toolchain-trusty-4.0
> +    packages:
> +      - cmake
> +      - libboost-dev
> +      - libboost-regex-dev
> +      - libboost-system-dev
> +      - libboost-test-dev
> +      - libglew-dev
> +      - libicu-dev

I'm a bit torn on whether to list `libicu-dev` or not. It will be pulled in as a transitive dependency (at least from boost).

> +      - libpng-dev
> +      - libsdl2-dev
> +      - libsdl2-image-dev
> +      - libsdl2-mixer-dev
> +      - libsdl2-ttf-dev
> +      - python-pip
> +      - zlib1g-dev
> +
>  matrix:
>    include:
> -     - compiler: clang
> -       env: CLANG_VERSION="3.4" BUILD_TYPE="Debug"
> -     - compiler: clang
> -       env: CLANG_VERSION="3.5" BUILD_TYPE="Debug"
> -     - compiler: clang
> -       env: CLANG_VERSION="3.9" BUILD_TYPE="Debug"
> -     - compiler: clang
> -       env: CLANG_VERSION="4.0" BUILD_TYPE="Debug"
> -     - compiler: clang
> -       env: CLANG_VERSION="3.4" BUILD_TYPE="Release"
> -     - compiler: clang
> -       env: CLANG_VERSION="3.5" BUILD_TYPE="Release"
> -     - compiler: clang
> -       env: CLANG_VERSION="3.9" BUILD_TYPE="Release"
> -     - compiler: clang
> -       env: CLANG_VERSION="4.0" BUILD_TYPE="Release"
> -     - compiler: gcc
> -       env: GCC_VERSION="4.8" BUILD_TYPE="Debug"
> -     - compiler: gcc
> -       env: GCC_VERSION="4.9" BUILD_TYPE="Debug"
> -     - compiler: gcc
> -       env: GCC_VERSION="6" BUILD_TYPE="Debug"
> -     - compiler: gcc
> -       env: GCC_VERSION="7" BUILD_TYPE="Debug"
> -     - compiler: gcc
> -       env: GCC_VERSION="4.8" BUILD_TYPE="Release"
> -     - compiler: gcc
> -       env: GCC_VERSION="4.9" BUILD_TYPE="Release"
> -     - compiler: gcc
> -       env: GCC_VERSION="6" BUILD_TYPE="Release"
> -     - compiler: gcc
> -       env: GCC_VERSION="7" BUILD_TYPE="Release"
> +    - compiler: clang
> +      env: CLANG_VERSION="3.4" BUILD_TYPE="Debug"
> +    - compiler: clang
> +      env: CLANG_VERSION="3.5" BUILD_TYPE="Debug"
> +    - compiler: clang
> +      env: CLANG_VERSION="3.9" BUILD_TYPE="Debug"
> +    - compiler: clang
> +      env: CLANG_VERSION="4.0" BUILD_TYPE="Debug"
> +    - compiler: clang
> +      env: CLANG_VERSION="3.4" BUILD_TYPE="Release"
> +    - compiler: clang
> +      env: CLANG_VERSION="3.5" BUILD_TYPE="Release"
> +    - compiler: clang
> +      env: CLANG_VERSION="3.9" BUILD_TYPE="Release"
> +    - compiler: clang
> +      env: CLANG_VERSION="4.0" BUILD_TYPE="Release"
> +    - compiler: gcc
> +      env: GCC_VERSION="4.8" BUILD_TYPE="Debug"
> +    - compiler: gcc
> +      env: GCC_VERSION="4.9" BUILD_TYPE="Debug"
> +    - compiler: gcc
> +      env: GCC_VERSION="6" BUILD_TYPE="Debug"
> +    - compiler: gcc
> +      env: GCC_VERSION="7" BUILD_TYPE="Debug"
> +    - compiler: gcc
> +      env: GCC_VERSION="4.8" BUILD_TYPE="Release"
> +    - compiler: gcc
> +      env: GCC_VERSION="4.9" BUILD_TYPE="Release"
> +    - compiler: gcc
> +      env: GCC_VERSION="6" BUILD_TYPE="Release"
> +    - compiler: gcc
> +      env: GCC_VERSION="7" BUILD_TYPE="Release"


-- 
https://code.launchpad.net/~widelands-dev/widelands/travis-container/+merge/327492
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/travis-container into lp:widelands.