diff options
author | Daniel Narvaez <dwnarvaez@gmail.com> | 2013-05-20 12:57:53 (GMT) |
---|---|---|
committer | Daniel Narvaez <dwnarvaez@gmail.com> | 2013-05-20 12:57:53 (GMT) |
commit | 318014cfb50940a7a6603992962ac8424b8ddebe (patch) | |
tree | cca1574082e19b0480ef3191be1a5ff55ee39940 | |
parent | d98c171d07652f331c139544fc9323ca4a050eed (diff) |
Misc docs fixes
-rw-r--r-- | builders.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/builders.py b/builders.py index 95c9698..0fc9475 100644 --- a/builders.py +++ b/builders.py @@ -73,16 +73,16 @@ def create_factory(config, env={}, full=False, upload_docs=False): logfiles={"log": "build/logs/check.log"}, env=env)) - if upload_docs: - factory.addStep(ShellCommand(command=["./osbuild", "docs"], - description="docs", - descriptionDone="docs", - haltOnFailure=True, - logfiles={"log": "build/logs/docs.log"}, - env=env)) + factory.addStep(ShellCommand(command=["./osbuild", "docs"], + description="docs", + descriptionDone="docs", + haltOnFailure=True, + logfiles={"log": "build/logs/docs.log"}, + env=env)) - docs_url = "http://shell.sugarlabs.org/~buildbot/docs/index.html" - factory.addStep(DirectoryUpload(slavesrc="docs", + if upload_docs: + docs_url = "http://shell.sugarlabs.org/~buildbot/docs/index.md.html" + factory.addStep(DirectoryUpload(slavesrc="build/out/docs", masterdest="~/public_html/docs", url=docs_url)) |