From: John DeNisco Date: Wed, 11 Mar 2020 13:47:21 +0000 (-0400) Subject: docs: Add feature build to publish script X-Git-Tag: v20.09-rc0~427 X-Git-Url: https://gerrit.fd.io/r/gitweb?p=vpp.git;a=commitdiff_plain;h=92a6ac24f36dcc7e22682c0ce448cefc23d58e5e docs: Add feature build to publish script Signed-off-by: John DeNisco Change-Id: I6a938f426b9a8e1242fa5c6f9716a3f9db4d4976 --- diff --git a/docs/etc/requirements.txt b/docs/etc/requirements.txt index 5b037c69365..3c49148ce60 100644 --- a/docs/etc/requirements.txt +++ b/docs/etc/requirements.txt @@ -1,4 +1,5 @@ alabaster==0.7.12 +attrs==19.3.0 Babel==2.8.0 certifi==2019.11.28 chardet==3.0.4 @@ -6,12 +7,17 @@ commonmark==0.9.1 docutils==0.16 idna==2.8 imagesize==1.2.0 +importlib-metadata==1.5.0 Jinja2==2.10.3 +jsonschema==3.2.0 MarkupSafe==1.1.1 packaging==20.0 +pyaml==20.3.1 Pygments==2.5.2 pyparsing==2.4.6 +pyrsistent==0.15.7 pytz==2019.3 +PyYAML==5.3 recommonmark==0.6.0 requests==2.22.0 six==1.14.0 @@ -25,3 +31,4 @@ sphinxcontrib-jsmath==1.0.1 sphinxcontrib-qthelp==1.0.2 sphinxcontrib-serializinghtml==1.1.3 urllib3==1.25.8 +zipp==3.1.0 diff --git a/docs/scripts/publish-docs.sh b/docs/scripts/publish-docs.sh index 9cbef8ddc9a..bd1a9eae3b3 100755 --- a/docs/scripts/publish-docs.sh +++ b/docs/scripts/publish-docs.sh @@ -35,6 +35,7 @@ make docs # Clone the site repo rm -fr site +rm -fr sphinx_env git clone ssh://git@github.com/$SITE_USERNAME/site cd site git submodule update --init --recursive @@ -68,9 +69,16 @@ git branch # Copy the docs cp -r $SRC_DIR $TARGET_DIR +# Create the feature list +pushd .. +source ./sphinx_venv/bin/activate +find . -name FEATURE.yaml | ./src/scripts/fts.py --markdown > site/content/vppProject/vppfeatures/features.md +deactivate +popd + # 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