still fixing the doc generation

.travis.yml

@@ -31,9 +31,9 @@ script:
 - "if [ ${TRAVIS_OS_NAME} == 'linux' ]; then . ./tools/travis_linux_script.sh; fi"
 - "if [ ${TRAVIS_OS_NAME} == 'osx' ]; then . ./tools/travis_osx_script.sh; fi"
 after_success:
-- if [[ ( ${TRAVIS_OS_NAME} == "linux" && ${CC} == "gcc" && ${TRAVIS_BRANCH} == "master") ]]; then ./tools/.deployGH_doc.sh; fi
+- if [[ ( ${TRAVIS_OS_NAME} == "linux" && ${CC} == "gcc" && ${TRAVIS_BRANCH} == "master" && ${TRAVIS_PULL_REQUEST} == "false" ) ]]; then ./tools/.deployGH_doc.sh; fi
+- if [[ ( ${TRAVIS_OS_NAME} == "linux" && ${CC} == "gcc" && ${TRAVIS_BRANCH} == "master" && ${TRAVIS_PULL_REQUEST} == "false" ) ]]; then ./tools/.coverity.sh; fi
 - if [[ ( ${TRAVIS_OS_NAME} == "linux" && ${CC} == "gcc" ) ]]; then ./tools/.deployGH_release.sh; fi
-- if [[ ( ${TRAVIS_OS_NAME} == "linux" && ${CC} == "gcc" && ${TRAVIS_BRANCH} == "master") ]]; then ./tools/.coverity.sh; fi
 before_deploy:
 - rm build -rf && mkdir -p build && cd build
 - echo "Cross compile release build for Raspberry Pi"

tools/.deployGH_doc.sh

@@ -1,20 +1,21 @@
 #!/bin/bash
 
 #
-# This script is run by travis-ci and pushes generated
-# Doxygen docs and single-source distributions to open62541-www
+# This script is run by travis-ci and pushes generated docs and single-source
+# distributions to open62541-www
 #
 
 git clone --depth=5 -b gh-pages https://$GITAUTH@github.com/open62541/open62541-www
 cd open62541-www
-#handle doc
-git rm -r -f doc
-cp -r ../doc ./
-git add -A doc/*
+
+git rm -r -f ./doc/current/*
+cp -r ../doc/* ./doc/current/
+git add -A ./doc/current
 git config --global user.email "open62541-travis-ci@users.noreply.github.com"
 git config --global user.name "Open62541 travis-ci"
 git config --global push.default simple
 git commit -am "updated generated documentation on webpage by travis-ci [ci skip]"
 git push https://$GITAUTH@github.com/open62541/open62541-www
+
 cd ..
 rm -rf open62541-www

tools/travis_linux_script.sh

@@ -61,28 +61,6 @@ echo "Compile multithreaded version"
 cmake -DENABLE_MULTITHREADING=ON -DBUILD_EXAMPLESERVER=ON ..
 make
 
-# push updated doc
-BRANCH=$(git branch | sed -n -e 's/^\* \(.*\)/\1/p')
-if [[ ${BRANCH} == "master" ]]; then
-    cd .. && rm build -rf && mkdir -p build && cd build
-    cd build
-    rm -rf *
-    cmake -DBUILD_DOCUMENTATION=ON ..
-    make doc
-    git clone --depth=5 -b gh-pages https://$GITAUTH@github.com/acplt/open62541-www
-    cd open62541-www
-    git rm -r -f ./doc/current/*
-    cp -r ../doc/* ./doc/current/
-    git add -A ./doc/current
-    git config --global user.email "open62541-travis-ci@users.noreply.github.com"
-    git config --global user.name "Open62541 travis-ci"
-    git config --global push.default simple
-    git commit -am "gh-pages updated by travis-ci"
-    git push https://$GITAUTH@github.com/open62541/open62541-www
-    cd ..
-    rm -rf open62541-www
-fi
-
 cd .. && rm build -rf && mkdir -p build && cd build
 echo "Debug build and unit tests (64 bit)"
 cmake -DCMAKE_BUILD_TYPE=Debug -DBUILD_DEMO_NODESET=ON -DBUILD_UNIT_TESTS=ON -DBUILD_EXAMPLESERVER=ON -DENABLE_COVERAGE=ON ..