From 570f3c77287d742bcbebce590dc26d7178419ad3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20Benn=C3=A9e?= <alex.bennee@linaro.org>
Date: Fri, 1 Feb 2019 17:12:29 +0000
Subject: [PATCH] .travis.yml: separate tools and docs into another entry
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Re-building the tools and documents by default is a little wasteful as
they are not really affected by the main build options. Split tools
and documents into their own task with a minimal softmmu and
linux-user target list just to check they don't interact badly.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
.travis.yml | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index beea9414089..652be702acd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -59,6 +59,7 @@ env:
global:
- SRC_DIR="."
- BUILD_DIR="."
+ - BASE_CONFIG="--disable-docs --disable-tools"
- TEST_CMD="make check -j3 V=1"
@@ -69,7 +70,7 @@ git:
before_script:
- mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR}
- - ${SRC_DIR}/configure ${CONFIG} || { cat config.log && exit 1; }
+ - ${SRC_DIR}/configure ${BASE_CONFIG} ${CONFIG} || { cat config.log && exit 1; }
script:
- make -j3 && ${TEST_CMD}
@@ -104,6 +105,17 @@ matrix:
- CONFIG="--with-coroutine=sigaltstack --disable-linux-user"
+ # Check we can build docs and tools
+ - env:
+ - BASE_CONFIG="--enable-tools --enable-docs"
+ - CONFIG="--target-list=x86_64-softmmu,aarch64-linux-user"
+ addons:
+ apt:
+ packages:
+ - python-sphinx
+ - texinfo
+ - perl
+
# Test out-of-tree builds
- env:
- CONFIG="--enable-debug --enable-debug-tcg"
@@ -241,5 +253,5 @@ matrix:
- env:
- - CONFIG="--disable-system --disable-docs"
+ - CONFIG="--disable-system"
- TEST_CMD="make -j3 check-tcg V=1"
--
GitLab