From cd9271e8f3b872c34fee3a8c207547008b049269 Mon Sep 17 00:00:00 2001 From: Maxim Uvarov Date: Mon, 18 Sep 2017 19:21:11 +0300 Subject: [PATCH 1/3] travis: doxygen 1.8.13 Signed-off-by: Maxim Uvarov --- .travis.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 43141f9f19..875509cfab 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,7 +39,7 @@ addons: packages: - gcc - clang-3.8 - - automake autoconf libtool libssl-dev graphviz mscgen doxygen + - automake autoconf libtool libssl-dev graphviz mscgen - libpcap-dev # coverity_scan: # project: @@ -237,6 +237,13 @@ jobs: install: - true script: + - wget https://github.com/doxygen/doxygen/archive/Release_1_8_13.tar.gz + - tar xpvf Release_1_8_13.tar.gz + - pushd doxygen-Release_1_8_13 + - cmake -DCMAKE_INSTALL_PREFIX=/usr . + - sudo make install + - popd + # doxygen does not trap on warnings, check for them here. - ./bootstrap - ./configure From 0e52e2723f5b4198cc4d38d8d1d3959717faa30f Mon Sep 17 00:00:00 2001 From: Maxim Uvarov Date: Tue, 19 Sep 2017 13:05:15 +0300 Subject: [PATCH 2/3] travis: capture doxygen warnings right declare more clear syntax to capture doxygen warnings. Signed-off-by: Maxim Uvarov --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 875509cfab..21fa9e3bac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -247,8 +247,8 @@ jobs: # doxygen does not trap on warnings, check for them here. - ./bootstrap - ./configure - - make doxygen-doc |tee doxygen.log - - fgrep -rvq warning ./doxygen.log + - make doxygen-doc 2>&1 |tee doxygen.log + - fgrep -rq warning ./doxygen.log && false - stage: test env: TEST=checkpatch compiler: gcc From d24721dd3d1c5be7ea1a1cb7d5e35d172258d615 Mon Sep 17 00:00:00 2001 From: Maxim Uvarov Date: Tue, 19 Sep 2017 23:23:23 +0300 Subject: [PATCH 3/3] travis: cache doxygen Signed-off-by: Maxim Uvarov --- .travis.yml | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 21fa9e3bac..a9ae219dc1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -60,6 +60,7 @@ cache: - dpdk - netmap - $HOME/cunit-install + - $HOME/doxygen-install env: - CONF="" @@ -237,13 +238,17 @@ jobs: install: - true script: - - wget https://github.com/doxygen/doxygen/archive/Release_1_8_13.tar.gz - - tar xpvf Release_1_8_13.tar.gz - - pushd doxygen-Release_1_8_13 - - cmake -DCMAKE_INSTALL_PREFIX=/usr . - - sudo make install - - popd + - | + if [ ! -f "$HOME/doxygen-install/bin/doxygen" ]; then + wget https://github.com/doxygen/doxygen/archive/Release_1_8_13.tar.gz + tar xpvf Release_1_8_13.tar.gz + pushd doxygen-Release_1_8_13 + cmake -DCMAKE_INSTALL_PREFIX=$HOME/doxygen-install . + make install + popd + fi + - export PATH=$HOME/doxygen-install/bin:$PATH # doxygen does not trap on warnings, check for them here. - ./bootstrap - ./configure