[dpdk-stable] patch 'ci: add missing dependencies for documentation' has been queued to LTS release 18.11.6

[Kevin Traynor]

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 rebasing
(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/9bbac9b19682b01344b8f959d8cc098684ad7fcd

Thanks.

Kevin.

---
>From 9bbac9b19682b01344b8f959d8cc098684ad7fcd Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand at redhat.com>
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 <david.marchand at redhat.com>
Acked-by: Aaron Conole <aconole at redhat.com>
---
 .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" = "1" ]; then
 fi
 
+if [ "$BUILD_DOCS" = "1" ]; then
+    OPTS="$OPTS -Denable_docs=true"
+fi
+
 OPTS="$OPTS --default-library=$DEF_LIB"
 meson build --werror -Dexamples=all $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]
 
+doc_packages: &doc_packages
+  - [doxygen, graphviz, python3-sphinx]
+
 before_install: ./.ci/${TRAVIS_OS_NAME}-setup.sh
 
@@ -52,5 +55,5 @@ matrix:
         packages:
           - *extra_packages
-  - env: DEF_LIB="shared" EXTRA_PACKAGES=1
+  - env: DEF_LIB="shared" EXTRA_PACKAGES=1 BUILD_DOCS=1
     compiler: gcc
     addons:
@@ -58,4 +61,5 @@ matrix:
         packages:
           - *extra_packages
+          - *doc_packages
   - env: DEF_LIB="static" OPTS="-Denable_kmods=false" EXTRA_PACKAGES=1
     compiler: gcc
@@ -82,4 +86,5 @@ matrix:
         packages:
           - *extra_packages
+          - *doc_packages
   - env: DEF_LIB="static" OPTS="-Denable_kmods=false" EXTRA_PACKAGES=1
     compiler: clang
-- 
2.21.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-11-22 14:36:57.496284096 +0000
+++ 0043-ci-add-missing-dependencies-for-documentation.patch	2019-11-22 14:36:55.227148645 +0000
@@ -0,0 +1,71 @@
+From 9bbac9b19682b01344b8f959d8cc098684ad7fcd Mon Sep 17 00:00:00 2001
+From: David Marchand <david.marchand at redhat.com>
+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 <david.marchand at redhat.com>
+Acked-by: Aaron Conole <aconole at redhat.com>
+---
+ .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" = "1" ]; then
+ fi
+ 
++if [ "$BUILD_DOCS" = "1" ]; then
++    OPTS="$OPTS -Denable_docs=true"
++fi
++
+ OPTS="$OPTS --default-library=$DEF_LIB"
+ meson build --werror -Dexamples=all $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]
+ 
++doc_packages: &doc_packages
++  - [doxygen, graphviz, python3-sphinx]
++
+ before_install: ./.ci/${TRAVIS_OS_NAME}-setup.sh
+ 
+@@ -52,5 +55,5 @@ matrix:
+         packages:
+           - *extra_packages
+-  - env: DEF_LIB="shared" EXTRA_PACKAGES=1
++  - env: DEF_LIB="shared" EXTRA_PACKAGES=1 BUILD_DOCS=1
+     compiler: gcc
+     addons:
+@@ -58,4 +61,5 @@ matrix:
+         packages:
+           - *extra_packages
++          - *doc_packages
+   - env: DEF_LIB="static" OPTS="-Denable_kmods=false" EXTRA_PACKAGES=1
+     compiler: gcc
+@@ -82,4 +86,5 @@ matrix:
+         packages:
+           - *extra_packages
++          - *doc_packages
+   - env: DEF_LIB="static" OPTS="-Denable_kmods=false" EXTRA_PACKAGES=1
+     compiler: clang
+-- 
+2.21.0
+