Skip to content
This repository was archived by the owner on Nov 17, 2023. It is now read-only.

Make sure build_doc only builds target version #9900

Merged
marcoabreu merged 1 commit into from
Feb 27, 2018
Merged

Make sure build_doc only builds target version #9900

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 8 additions & 11 deletions docs/build_version_doc/build_doc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]} ]
Expand Down