From 6fe9dada74db6be2bb623f6c2eaac6f5cf31be57 Mon Sep 17 00:00:00 2001 From: Marco de Abreu Date: Tue, 27 Feb 2018 15:06:53 +0100 Subject: [PATCH] Make sure build_doc only builds target version --- docs/build_version_doc/build_doc.sh | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/docs/build_version_doc/build_doc.sh b/docs/build_version_doc/build_doc.sh index 2e4ed063d5ed..5e1a2b700668 100755 --- a/docs/build_version_doc/build_doc.sh +++ b/docs/build_version_doc/build_doc.sh @@ -121,19 +121,16 @@ then echo " ****************************************** " echo " Successfully built new release $latest_tag " echo " ****************************************** " -fi - -# Build latest master -echo " ********** Building Master ************ " -git checkout master -git checkout -- . -git submodule update +else + # Build latest master + echo " ********** Building Master ************ " -make docs || exit 1 + make docs || exit 1 -rm -rfv $web_folder/versions/master/* -cp -a "docs/_build/html/." "$web_folder/versions/master" -tests/ci_build/ci_build.sh doc python docs/build_version_doc/AddVersion.py --file_path "$web_folder/versions/master" + rm -rfv $web_folder/versions/master/* + cp -a "docs/_build/html/." "$web_folder/versions/master" + tests/ci_build/ci_build.sh doc python docs/build_version_doc/AddVersion.py --file_path "$web_folder/versions/master" +fi # Update version list for all previous version website if [ $latest_tag != ${tag_list[0]} ]