summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-x.ci/linux-build.sh8
-rw-r--r--.travis.yml7
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: