From patchwork Tue Aug 13 13:22:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Marchand X-Patchwork-Id: 57660 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D271B1BDAC; Tue, 13 Aug 2019 15:22:30 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id A0AA38F96 for ; Tue, 13 Aug 2019 15:22:29 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0932330BCB80 for ; Tue, 13 Aug 2019 13:22:29 +0000 (UTC) Received: from dmarchan.remote.csb (ovpn-204-32.brq.redhat.com [10.40.204.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id EAF7953; Tue, 13 Aug 2019 13:22:27 +0000 (UTC) From: David Marchand To: dev@dpdk.org Cc: aconole@redhat.com, msantana@redhat.com Date: Tue, 13 Aug 2019 15:22:16 +0200 Message-Id: <1565702536-9596-1-git-send-email-david.marchand@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Tue, 13 Aug 2019 13:22:29 +0000 (UTC) Subject: [dpdk-dev] [PATCH] ci: add missing dependencies for documentation X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Install missing dependencies so that doc can be generated. While at it, explicitly configure that we want the doc to be generated. Missing dependencies are then reported as an error rather than silently ignored. Because of these extra dependencies, only build them in dedicated travis jobs. Fixes: ad2b2cfb1ea3 ("ci: enable unit tests with Travis") Signed-off-by: David Marchand Acked-by: Aaron Conole --- .ci/linux-build.sh | 8 ++++---- .travis.yml | 7 ++++++- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.ci/linux-build.sh b/.ci/linux-build.sh index d5ad919..6075c44 100755 --- a/.ci/linux-build.sh +++ b/.ci/linux-build.sh @@ -19,14 +19,14 @@ if [ "$AARCH64" = "1" ]; then OPTS="$OPTS --cross-file config/arm/arm64_armv8_linux_gcc" fi +if [ "$BUILD_DOCS" = "1" ]; then + OPTS="$OPTS -Denable_docs=true" +fi + OPTS="$OPTS --default-library=$DEF_LIB" meson build --werror -Dexamples=all $OPTS ninja -C build -if [ "$BUILD_DOCS" = "1" ]; then - ninja -C build doc -fi - if [ "$RUN_TESTS" = "1" ]; then sudo meson test -C build --suite fast-tests -t 3 fi diff --git a/.travis.yml b/.travis.yml index 781f9f6..3d6ef29 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,6 +23,9 @@ extra_packages: &extra_packages - *required_packages - [libbsd-dev, libpcap-dev, libcrypto++-dev, libjansson4] +doc_packages: &doc_packages + - [doxygen, graphviz, python3-sphinx] + before_install: ./.ci/${TRAVIS_OS_NAME}-setup.sh env: @@ -30,7 +33,7 @@ env: - DEF_LIB="shared" - DEF_LIB="static" OPTS="-Denable_kmods=false" - DEF_LIB="shared" OPTS="-Denable_kmods=false" - - DEF_LIB="shared" RUN_TESTS=1 BUILD_DOCS=1 + - DEF_LIB="shared" RUN_TESTS=1 matrix: include: @@ -58,6 +61,7 @@ matrix: apt: packages: - *extra_packages + - *doc_packages - env: DEF_LIB="static" OPTS="-Denable_kmods=false" EXTRA_PACKAGES=1 compiler: gcc addons: @@ -88,6 +92,7 @@ matrix: apt: packages: - *extra_packages + - *doc_packages - env: DEF_LIB="static" OPTS="-Denable_kmods=false" EXTRA_PACKAGES=1 compiler: clang addons: