Commit 33d076eb authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/stsquad/tags/pull-travis-10022017-1' into staging 



One minor fix and a build split to reduce timeouts.

# gpg: Signature made Fri 10 Feb 2017 14:46:52 GMT
# gpg:                using RSA key 0xFBD0DB095A9E2A44
# gpg: Good signature from "Alex Bennée (Master Work Key) <alex.bennee@linaro.org>"
# Primary key fingerprint: 6685 AE99 E751 67BC AFC8  DF35 FBD0 DB09 5A9E 2A44

* remotes/stsquad/tags/pull-travis-10022017-1:
  .travis.yml: split VM based builds
  .travis.yml: don't specify CONFIG twice

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 8b189772 78a22af0

.travis.yml

+34 −5
Original line number Diff line number Diff line
@@ -92,8 +92,8 @@ 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
@@ -103,16 +103,45 @@ 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

    - env: CONFIG=""

    # Plain Trusty Linux User Build

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

      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

    # 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

      language: generic

      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'