ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

One minor fix and a build split to reduce timeouts. 

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJYndJcAAoJEPvQ2wlanipEqCQH/j85vUUkHyeESut3my2iqwol
 eZ66lJ4PADykwEAwax5DIaSkcIOmC9tLWkqvsqRrwkuT59J+k8dIJwvWyOcHoVXF
 Kfmws5zUqyipJk0KMaNkSbLtim8G8aMevaKqkVWDlmDpn9hzdXU3/OYBmU7Y2hGv
 KhcGmCrKd8rn3b34lhJvsVxXUxIHUlUi5swzm9iDwBeUdvjKnwch5MtaUS+FfVXe
 53Ix6u3ZykuK8VW7hKkx9sxUdjGUmEuXVcdy20/w1tpDsI/s665/GysAYK99tOIA
 zTywjSi1cNNqOOkhGIMrtL2qLWeu9aDWRZVnwZN/RszJn2giLnisvZW+FniLaBw=
 =2Ltn
 -----END PGP SIGNATURE-----

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: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2017-02-10 15:05:36 +00:00
parent 8b1897725d 78a22af040
commit 33d076ebd0
1 changed files with 34 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
.travis.yml
View File

@ -92,8 +92,8 @@ matrix:
- env: CONFIG="" - env: CONFIG=""
os: osx os: osx
compiler: clang compiler: clang
# Plain Trusty Build # Plain Trusty System Build
- env: CONFIG="" - env: CONFIG="--disable-linux-user"
sudo: required sudo: required
addons: addons:
dist: trusty dist: trusty
@ -103,16 +103,45 @@ matrix:
- sudo apt-get build-dep -qq qemu - sudo apt-get build-dep -qq qemu
- wget -O - http://people.linaro.org/~alex.bennee/qemu-submodule-git-seed.tar.xz | tar -xvJ - wget -O - http://people.linaro.org/~alex.bennee/qemu-submodule-git-seed.tar.xz | tar -xvJ
- git submodule update --init --recursive - git submodule update --init --recursive
# Trusty build with latest stable clang # Plain Trusty Linux User Build
- env: CONFIG="" - env: CONFIG="--disable-system"
sudo: required 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: addons:
dist: trusty dist: trusty
language: generic language: generic
compiler: none compiler: none
env: env:
- COMPILER_NAME=clang CXX=clang++-3.9 CC=clang-3.9 - COMPILER_NAME=clang CXX=clang++-3.9 CC=clang-3.9
- CONFIG="--cc=clang-3.9 --cxx=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="--disable-system --cc=clang-3.9 --cxx=clang++-3.9"
before_install: before_install:
- wget -nv -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add - - 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-add-repository -y 'deb http://llvm.org/apt/trusty llvm-toolchain-trusty-3.9 main'