From a273ce62d7e3eded5a146bcad8cf3103894a723f Mon Sep 17 00:00:00 2001 From: John DeNisco Date: Fri, 24 Jan 2020 14:04:41 -0500 Subject: docs: Update the requirements and fix the build Signed-off-by: John DeNisco Change-Id: I30e37f7e549083337b11ace95b4ff4f427d9fc8c --- docs/scripts/publish-docs.sh | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) (limited to 'docs/scripts') diff --git a/docs/scripts/publish-docs.sh b/docs/scripts/publish-docs.sh index 0a81dc07212..9cbef8ddc9a 100755 --- a/docs/scripts/publish-docs.sh +++ b/docs/scripts/publish-docs.sh @@ -29,6 +29,7 @@ SITE_USERNAME=$1 VPP_BRANCH=$2 #Build the docs +make docs-clean make docs-venv make docs @@ -46,27 +47,30 @@ git merge -m "Publish the Docs" upstream/master VERSION=`source $WS_ROOT/src/scripts/version` VERSION=${VERSION/"~"/"-"} -# Create a branch for the commit -git checkout -b $VERSION -git branch - # Copy the files to the appropriate directory SRC_DIR=../docs/_build/html/. if [ "$VPP_BRANCH" == "master" ] then TARGET_DIR=./static/docs/vpp/master - rm -fr ./static/docs/vpp/master + rm -fr $TARGET_DIR else TARGET_DIR=./static/docs/vpp/v$VPP_BRANCH - rm -fr ./static/docs/vpp/$TARGET_DIR - mkdir -p ./static/docs/vpp/$TARGET_DIR + rm -fr $TARGET_DIR + mkdir -p $TARGET_DIR + VERSION=v$VPP_BRANCH + ln -s $VERSION ./static/docs/vpp/latest fi +# Create a branch for the commit +git checkout -b $VERSION +git branch + +# Copy the docs cp -r $SRC_DIR $TARGET_DIR # Push the new docs -git add "*" -git commit -s -m "Publish docs from VPP $VERSION" -git push origin "$VERSION" +#git add "*" +#git commit -s -m "Publish docs from VPP $VERSION" +#git push origin "$VERSION" exit 0 -- cgit 1.2.3-korg