Skip to content
Snippets Groups Projects
Commit b8b61432 authored by Yannick DAYER's avatar Yannick DAYER
Browse files

Prioritize sphinx doc subdirectory for doc server.

parent 12d5be2c
No related branches found
No related tags found
No related merge requests found
Pipeline #65995 passed
Stage: qa
Stage: build
Stage: deploy
Hide whitespace changes
Inline Side-by-side
Showing
with 6 additions and 6 deletions
bob/devtools/build.py
+ 6
− 6
View file @ b8b61432
......@@ -503,19 +503,19 @@ def get_docserver_setup(public, stable, server, intranet, group):
if stable:
entries += [
server + prefix + "/docs/" + group + "/%(name)s/%(version)s/",
server + prefix + "/docs/" + group + "/%(name)s/stable/",
server
+ prefix
+ "/docs/"
+ group
+ "/%(name)s/%(version)s/sphinx/",
server + prefix + "/docs/" + group + "/%(name)s/stable/sphinx/",
server + prefix + "/docs/" + group + "/%(name)s/%(version)s/",
server + prefix + "/docs/" + group + "/%(name)s/stable/",
]
else:
entries += [
server + prefix + "/docs/" + group + "/%(name)s/master/",
server + prefix + "/docs/" + group + "/%(name)s/master/sphinx/",
server + prefix + "/docs/" + group + "/%(name)s/master/",
]
if not public:
......@@ -523,19 +523,19 @@ def get_docserver_setup(public, stable, server, intranet, group):
prefix = "/private"
if stable:
entries += [
server + prefix + "/docs/" + group + "/%(name)s/%(version)s/",
server + prefix + "/docs/" + group + "/%(name)s/stable/",
server
+ prefix
+ "/docs/"
+ group
+ "/%(name)s/%(version)s/sphinx/",
server + prefix + "/docs/" + group + "/%(name)s/stable/sphinx/",
server + prefix + "/docs/" + group + "/%(name)s/%(version)s/",
server + prefix + "/docs/" + group + "/%(name)s/stable/",
]
else:
entries += [
server + prefix + "/docs/" + group + "/%(name)s/master/",
server + prefix + "/docs/" + group + "/%(name)s/master/sphinx/",
server + prefix + "/docs/" + group + "/%(name)s/master/",
]
return "|".join(entries)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment