From fed53649715267962449a2114472e3a48bcc0e48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20Benn=C3=A9e?= Date: Fri, 20 Jan 2017 17:00:51 +0000 Subject: [PATCH 1/2] .travis.yml: don't specify CONFIG twice MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Alex Bennée --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d83e2d493b..3dc1e6439d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -104,8 +104,7 @@ matrix: - 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="" - sudo: required + - sudo: required addons: dist: trusty language: generic From 78a22af040b8ea7c26d52755facdc332ac7bac46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20Benn=C3=A9e?= Date: Fri, 20 Jan 2017 17:11:49 +0000 Subject: [PATCH 2/2] .travis.yml: split VM based builds MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: Alex Bennée --- .travis.yml | 38 ++++++++++++++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3dc1e6439d..9008a796f0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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,7 +103,18 @@ 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 + # 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 @@ -111,7 +122,26 @@ 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-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: - 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'