Commit ced98724 authored by Konstantinos Chatzilygeroudis's avatar Konstantinos Chatzilygeroudis
Browse files

Merge remote-tracking branch 'origin' into new_benchmarks

Conflicts:
	docs/pre_script.sh
parents c2453660 f4689119
......@@ -178,6 +178,8 @@ html_static_path = ['_static']
# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
# using the given strftime format.
#html_last_updated_fmt = '%b %d, %Y'
# remove timestamp to avoid too many commits
html_last_updated_fmt = None
# If true, SmartyPants will be used to convert quotes and dashes to
# typographically correct entities.
......
......@@ -8,9 +8,9 @@ cd ..
./waf default_params
echo "getting the latest benchmark result (needs to be in $HOME/limbo_benchmarks")
echo "getting the latest benchmark result (needs to be in $HOME/limbo_benchmarks)"
# get the last benchmark
DIR=$HOME/limbo_benchmarks
BENCHMARKS=$DIR/`ls $DIR|sort -n|head -n 1`
cp $BENCHMARKS/bo_benchmarks.rst docs/benchmarks.rst
cp $BENCHMARKS/bo_benchmarks.rst docs/bo_benchmarks.rst
cp -r $BENCHMARKS/fig_benchmarks docs
......@@ -226,7 +226,7 @@ def write_default_params(ctx):
def build_docs(ctx):
Logs.pprint('NORMAL', "generating HTML doc with versioning...")
s = 'sphinx-versioning -v build -f docs/pre_script.sh --whitelist-branches "(master|release-*)" docs docs/_build/html'
s = 'sphinx-versioning -v build -f docs/pre_script.sh --whitelist-branches "(new_benchmarks|master|release-*)" docs docs/_build/html'
retcode = subprocess.call(s, shell=True, env=None)
class BuildExtensiveTestsContext(BuildContext):
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment