X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fnsh_sfc%2Finclude-raw-nsh_sfc-docs.sh;h=119a41d41acbb7d97e9a41b1487a40b31b42e584;hb=refs%2Fchanges%2F16%2F4716%2F1;hp=1b41121ef4ec90ca672c600b650c328cd5451a16;hpb=b75ac7408631efa44aa7005204b7171da69ccb94;p=ci-management.git diff --git a/jjb/nsh_sfc/include-raw-nsh_sfc-docs.sh b/jjb/nsh_sfc/include-raw-nsh_sfc-docs.sh index 1b41121ef..119a41d41 100644 --- a/jjb/nsh_sfc/include-raw-nsh_sfc-docs.sh +++ b/jjb/nsh_sfc/include-raw-nsh_sfc-docs.sh @@ -10,38 +10,40 @@ set -xe -o pipefail [ "$VERSION" ] || VERSION=$(./nsh-plugin/packaging/scripts/version) make doxygen -mkdir -p $(dirname ${RESOURCES_DIR}) -mv -f ${DOC_DIR} ${RESOURCES_DIR} -cd ${SITE_DIR} -find . -type f '(' -name '*.md5' -o -name '*.dot' -o -name '*.map' ')' -delete -cat > pom.xml << EOF - - 4.0.0 - io.fd.${PROJECT_NAME} - docs - 1.0.0 - pom +if [[ ${JOB_NAME} == *merge* ]]; then + mkdir -p $(dirname ${RESOURCES_DIR}) + mv -f ${DOC_DIR} ${RESOURCES_DIR} + cd ${SITE_DIR} + find . -type f '(' -name '*.md5' -o -name '*.dot' -o -name '*.map' ')' -delete + cat > pom.xml << EOF + + 4.0.0 + io.fd.${PROJECT_NAME} + docs + 1.0.0 + pom - - false - + + false + - - - - org.apache.maven.wagon - wagon-webdav-jackrabbit - 2.9 - - - - - - fdio-site - dav:${DOCS_REPO_URL}/${PROJECT_PATH}/${VERSION} - - - + + + + org.apache.maven.wagon + wagon-webdav-jackrabbit + 2.9 + + + + + + fdio-site + dav:${DOCS_REPO_URL}/${PROJECT_PATH}/${VERSION} + + + EOF -${MVN} site:site site:deploy -gs "${GLOBAL_SETTINGS_FILE}" -s "${SETTINGS_FILE}" -T 4C -cd - + ${MVN} site:site site:deploy -gs "${GLOBAL_SETTINGS_FILE}" -s "${SETTINGS_FILE}" -T 4C + cd - +fi