From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 601DFA04C3 for ; Fri, 22 Nov 2019 15:43:09 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 550DA91; Fri, 22 Nov 2019 15:43:09 +0100 (CET) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by dpdk.org (Postfix) with ESMTP id 22FD01BEB5 for ; Fri, 22 Nov 2019 15:43:08 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574433787; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AxKuu4C9Xi90Y76Uwc/HXtrs73awRhWZpzq5XC8g0wk=; b=EEbt3VLHveGgJyaD04LN21JIYc65YYCntc8H2EoGbkz7Smq3I2MJ3yF+eTsvVyDNcJvi83 /Bd9SK6RKoo7GXvPf7JkZhU07h5JoClKePbGhWcqdI5khQZK+LTrqcIbmyojApakgEZGtp dYMl+doQttzfO0QfDdPt5sWhL9GjYg8= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-415-ylUEH0IdP5WpJTUB_c3ClA-1; Fri, 22 Nov 2019 09:43:06 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2FE1A107ACC7 for ; Fri, 22 Nov 2019 14:43:05 +0000 (UTC) Received: from rh.redhat.com (unknown [10.36.118.60]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2BE866E71F; Fri, 22 Nov 2019 14:43:01 +0000 (UTC) From: Kevin Traynor To: David Marchand Cc: Aaron Conole , dpdk stable Date: Fri, 22 Nov 2019 14:41:29 +0000 Message-Id: <20191122144131.21231-43-ktraynor@redhat.com> In-Reply-To: <20191122144131.21231-1-ktraynor@redhat.com> References: <20191122144131.21231-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: ylUEH0IdP5WpJTUB_c3ClA-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'ci: add missing dependencies for documentation' has been queued to LTS release 18.11.6 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/29/19. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasi= ng (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/9bbac9b19682b01344= b8f959d8cc098684ad7fcd Thanks. Kevin. --- >From 9bbac9b19682b01344b8f959d8cc098684ad7fcd Mon Sep 17 00:00:00 2001 From: David Marchand Date: Tue, 13 Aug 2019 15:22:16 +0200 Subject: [PATCH] ci: add missing dependencies for documentation [ upstream commit 7632da0b875f0e2ca9b5c1bc03e8a43bc25c9f9e] 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 | 4 ++++ .travis.yml | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.ci/linux-build.sh b/.ci/linux-build.sh index 4eb7c3cf0..4d28d1222 100755 --- a/.ci/linux-build.sh +++ b/.ci/linux-build.sh @@ -20,4 +20,8 @@ if [ "$AARCH64" =3D "1" ]; then fi =20 +if [ "$BUILD_DOCS" =3D "1" ]; then + OPTS=3D"$OPTS -Denable_docs=3Dtrue" +fi + OPTS=3D"$OPTS --default-library=3D$DEF_LIB" meson build --werror -Dexamples=3Dall $OPTS diff --git a/.travis.yml b/.travis.yml index 7b167fa64..636c38cec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,4 +24,7 @@ extra_packages: &extra_packages - [libbsd-dev, libpcap-dev, libcrypto++-dev, libjansson4] =20 +doc_packages: &doc_packages + - [doxygen, graphviz, python3-sphinx] + before_install: ./.ci/${TRAVIS_OS_NAME}-setup.sh =20 @@ -52,5 +55,5 @@ matrix: packages: - *extra_packages - - env: DEF_LIB=3D"shared" EXTRA_PACKAGES=3D1 + - env: DEF_LIB=3D"shared" EXTRA_PACKAGES=3D1 BUILD_DOCS=3D1 compiler: gcc addons: @@ -58,4 +61,5 @@ matrix: packages: - *extra_packages + - *doc_packages - env: DEF_LIB=3D"static" OPTS=3D"-Denable_kmods=3Dfalse" EXTRA_PACKAGES= =3D1 compiler: gcc @@ -82,4 +86,5 @@ matrix: packages: - *extra_packages + - *doc_packages - env: DEF_LIB=3D"static" OPTS=3D"-Denable_kmods=3Dfalse" EXTRA_PACKAGES= =3D1 compiler: clang --=20 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092019-11-22 14:36:57.496284096 +0000 +++ 0043-ci-add-missing-dependencies-for-documentation.patch=092019-11-22 1= 4:36:55.227148645 +0000 @@ -0,0 +1,71 @@ +From 9bbac9b19682b01344b8f959d8cc098684ad7fcd Mon Sep 17 00:00:00 2001 +From: David Marchand +Date: Tue, 13 Aug 2019 15:22:16 +0200 +Subject: [PATCH] ci: add missing dependencies for documentation + +[ upstream commit 7632da0b875f0e2ca9b5c1bc03e8a43bc25c9f9e] + +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 | 4 ++++ + .travis.yml | 7 ++++++- + 2 files changed, 10 insertions(+), 1 deletion(-) + +diff --git a/.ci/linux-build.sh b/.ci/linux-build.sh +index 4eb7c3cf0..4d28d1222 100755 +--- a/.ci/linux-build.sh ++++ b/.ci/linux-build.sh +@@ -20,4 +20,8 @@ if [ "$AARCH64" =3D "1" ]; then + fi +=20 ++if [ "$BUILD_DOCS" =3D "1" ]; then ++ OPTS=3D"$OPTS -Denable_docs=3Dtrue" ++fi ++ + OPTS=3D"$OPTS --default-library=3D$DEF_LIB" + meson build --werror -Dexamples=3Dall $OPTS +diff --git a/.travis.yml b/.travis.yml +index 7b167fa64..636c38cec 100644 +--- a/.travis.yml ++++ b/.travis.yml +@@ -24,4 +24,7 @@ extra_packages: &extra_packages + - [libbsd-dev, libpcap-dev, libcrypto++-dev, libjansson4] +=20 ++doc_packages: &doc_packages ++ - [doxygen, graphviz, python3-sphinx] ++ + before_install: ./.ci/${TRAVIS_OS_NAME}-setup.sh +=20 +@@ -52,5 +55,5 @@ matrix: + packages: + - *extra_packages +- - env: DEF_LIB=3D"shared" EXTRA_PACKAGES=3D1 ++ - env: DEF_LIB=3D"shared" EXTRA_PACKAGES=3D1 BUILD_DOCS=3D1 + compiler: gcc + addons: +@@ -58,4 +61,5 @@ matrix: + packages: + - *extra_packages ++ - *doc_packages + - env: DEF_LIB=3D"static" OPTS=3D"-Denable_kmods=3Dfalse" EXTRA_PACKAGE= S=3D1 + compiler: gcc +@@ -82,4 +86,5 @@ matrix: + packages: + - *extra_packages ++ - *doc_packages + - env: DEF_LIB=3D"static" OPTS=3D"-Denable_kmods=3Dfalse" EXTRA_PACKAGE= S=3D1 + compiler: clang +--=20 +2.21.0 +