diff options
| author |   Vanessa Rene Valderrama <vvalderrama@linuxfoundation.org> | 2020-02-21 17:25:07 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2020-02-21 17:25:07 +0000 |
| commit | dfa6fccf10efe0d7692635075e8ea1c0da3a9524 (patch) | |
| tree | 9b43e43ffb903555a321552637305d8c852c7bea | |
| parent | 7016ca89509296131c5902a6c5d5619fcb177d8d (diff) | |
| parent | 3f883e5c10ecc15c9ef3fd3c7d81a90b10bfcbd6 (diff) | |
Merge "Build both sphinx and doxygen docs in verify/merge jobs. Push only doxygen on nexus.fd.io"
| -rw-r--r-- | jjb/hicn/include-raw-hicn-docs.sh | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/jjb/hicn/include-raw-hicn-docs.sh b/jjb/hicn/include-raw-hicn-docs.sh index c97df6c3a..f90c8fe8d 100644 --- a/jjb/hicn/include-raw-hicn-docs.sh +++ b/jjb/hicn/include-raw-hicn-docs.sh @@ -1,24 +1,10 @@ #!/bin/bash set -xe -o pipefail -update_cmake_repo() { - cat /etc/resolv.conf - echo "nameserver 8.8.8.8" | sudo tee -a /etc/resolv.conf - cat /etc/resolv.conf - - CMAKE_INSTALL_SCRIPT_URL="https://cmake.org/files/v3.8/cmake-3.8.0-Linux-x86_64.sh" - CMAKE_INSTALL_SCRIPT="/tmp/install_cmake.sh" - curl ${CMAKE_INSTALL_SCRIPT_URL} > ${CMAKE_INSTALL_SCRIPT} - - sudo mkdir -p /opt/cmake - sudo bash ${CMAKE_INSTALL_SCRIPT} --skip-license --prefix=/opt/cmake - export PATH=/opt/cmake/bin:$PATH -} - [ "$DOCS_REPO_URL" ] || DOCS_REPO_URL="https://nexus.fd.io/content/sites/site" [ "$PROJECT_PATH" ] || PROJECT_PATH="io/fd/hicn" [ "$DOC_FILE" ] || DOC_FILE="hicn.docs.zip" -[ "$DOC_DIR" ] || DOC_DIR="build/lib/doc/html" +[ "$DOC_DIR" ] || DOC_DIR="build-doxygen/lib/doc/html" [ "$SITE_DIR" ] || SITE_DIR="build/doc/deploy-site/" [ "$RESOURCES_DIR" ] || RESOURCES_DIR=${SITE_DIR}/src/site/resources [ "$MVN" ] || MVN="/opt/apache/maven/bin/mvn" @@ -26,12 +12,8 @@ update_cmake_repo() { echo "Current directory: $(pwd)" -update_cmake_repo -mkdir -p build -pushd build -cmake -DBUILD_HICNPLUGIN=OFF -DBUILD_HICNLIGHT=OFF -DBUILD_LIBTRANSPORT=OFF -DBUILD_UTILS=OFF -DBUILD_APPS=OFF -DBUILD_CTRL=OFF .. -make doc -popd +bash scripts/build-packages.sh sphinx +bash scripts/build-packages.sh doxygen if [[ ${JOB_NAME} == *merge* ]]; then mkdir -p $(dirname ${RESOURCES_DIR}) |