Commit 78a22af0 authored by Alex Bennée's avatar Alex Bennée
Browse files

.travis.yml: split VM based builds 



The Trusty based builds run a little slower than the main container
based ones. This is also true for the latest version of Clang. The
builds are getting very close (and occasionally run over) the 50 minute
timeout. Rather than partitioning by target I just split them into
linux-user and system builds.

Signed-off-by: default avatarAlex Bennée <alex.bennee@linaro.org>
parent fed53649

.travis.yml

+34 −4
Original line number Diff line number Diff line
@@ -92,8 +92,19 @@ matrix: 
    - env: CONFIG=""

      os: osx

      compiler: clang

    # Plain Trusty Build

    - env: CONFIG=""

    # Plain Trusty System Build

    - env: CONFIG="--disable-linux-user"

      sudo: required

      addons:

      dist: trusty

      compiler: gcc

      before_install:

        - sudo apt-get update -qq

        - sudo apt-get build-dep -qq qemu

        - wget -O - http://people.linaro.org/~alex.bennee/qemu-submodule-git-seed.tar.xz | tar -xvJ

        - git submodule update --init --recursive

    # Plain Trusty Linux User Build

    - env: CONFIG="--disable-system"

      sudo: required

      addons:

      dist: trusty
@@ -103,7 +114,26 @@ matrix: 
        - sudo apt-get build-dep -qq qemu

        - wget -O - http://people.linaro.org/~alex.bennee/qemu-submodule-git-seed.tar.xz | tar -xvJ

        - git submodule update --init --recursive

    # Trusty build with latest stable clang

    # Trusty System build with latest stable clang

    - sudo: required

      addons:

      dist: trusty

      language: generic

      compiler: none

      env:

        - COMPILER_NAME=clang CXX=clang++-3.9 CC=clang-3.9

        - CONFIG="--disable-linux-user --cc=clang-3.9 --cxx=clang++-3.9"

      before_install:

        - wget -nv -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add -

        - sudo apt-add-repository -y 'deb http://llvm.org/apt/trusty llvm-toolchain-trusty-3.9 main'

        - sudo apt-get update -qq

        - sudo apt-get install -qq -y clang-3.9

        - sudo apt-get build-dep -qq qemu

        - wget -O - http://people.linaro.org/~alex.bennee/qemu-submodule-git-seed.tar.xz | tar -xvJ

        - git submodule update --init --recursive

      before_script:

        - ./configure ${CONFIG} || cat config.log

    # Trusty Linux User build with latest stable clang

    - sudo: required

      addons:

      dist: trusty
@@ -111,7 +141,7 @@ matrix: 
      compiler: none

      env:

        - COMPILER_NAME=clang CXX=clang++-3.9 CC=clang-3.9

        - CONFIG="--cc=clang-3.9 --cxx=clang++-3.9"

        - CONFIG="--disable-system --cc=clang-3.9 --cxx=clang++-3.9"

      before_install:

        - wget -nv -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add -

        - sudo apt-add-repository -y 'deb http://llvm.org/apt/trusty llvm-toolchain-trusty-3.9 main'