summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri van Heesch <doxygen@gmail.com>2020-08-03 17:32:01 (GMT)
committerDimitri van Heesch <doxygen@gmail.com>2020-08-03 17:32:01 (GMT)
commit16c9215b2df863b84bffae0d7a0ab34fd631a929 (patch)
treedffd70f9640c99b543ca51120da0f0c33df6ceae
parenta0ff9effd8591a54d8c49a27e26ed7cc086d2be9 (diff)
parent0a699046a1cd497a41767141d38d86acd04e53e0 (diff)
downloadDoxygen-16c9215b2df863b84bffae0d7a0ab34fd631a929.zip
Doxygen-16c9215b2df863b84bffae0d7a0ab34fd631a929.tar.gz
Doxygen-16c9215b2df863b84bffae0d7a0ab34fd631a929.tar.bz2
Merge branch 'master' of github.com:doxygen/doxygen
-rw-r--r--.travis.yml6
1 files changed, 4 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index ced8d26..733e668 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -122,7 +122,9 @@ script:
- cmake --version;
- cmake -G "Unix Makefiles" -Dbuild_doc=ON -Dbuild_wizard=ON ..
- make
- - if [ ! "${TRAVIS_OS_NAME}" == "osx" ]; then
- make tests;
+ - if [ ! "${TRAVIS_OS_NAME}" == "osx" ] && [ ! "${TRAVIS_COMPILER}" == "clang" ]; then
+ make tests docs;
+ fi;
+ - if [ ! "${TRAVIS_OS_NAME}" == "osx" ] && [ "${TRAVIS_COMPILER}" == "clang" ]; then
make docs;
fi;