Skip to content

Commit 954fbf4

Browse files
committed
Refs #21114: Use correct branches of Fast DDS and Fast DDS Python in RTD
Signed-off-by: eduponz <eduardoponz@eprosima.com>
1 parent f77a99f commit 954fbf4

1 file changed

Lines changed: 6 additions & 21 deletions

File tree

docs/conf.py

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -216,22 +216,13 @@ def configure_doxyfile(
216216
fastdds_branch = os.environ.get('FASTDDS_BRANCH', None)
217217

218218
# First try to checkout to ${FASTDDS_BRANCH}
219-
# Else try with current documentation branch
220-
# Else checkout to master
219+
# Else checkout to 2.14.x
221220
if (fastdds_branch and
222221
fastdds.refs.__contains__('origin/{}'.format(fastdds_branch))):
223222
fastdds_branch = 'origin/{}'.format(fastdds_branch)
224-
elif (docs_branch and
225-
fastdds.refs.__contains__('origin/{}'.format(docs_branch))):
226-
fastdds_branch = 'origin/{}'.format(docs_branch)
227223
else:
228-
print(
229-
'Fast DDS does not have either "{}" or "{}" branches'.format(
230-
fastdds_branch,
231-
docs_branch
232-
)
233-
)
234-
fastdds_branch = 'origin/master'
224+
fastdds_branch = 'origin/2.14.x'
225+
print(f'Fast DDS branch is not set by env var. Using "{fastdds_branch}"')
235226

236227
# Actual checkout
237228
print('Checking out Fast DDS branch "{}"'.format(fastdds_branch))
@@ -248,20 +239,14 @@ def configure_doxyfile(
248239
fastdds_python_branch = os.environ.get('FASTDDS_PYTHON_BRANCH', None)
249240

250241
# First try to checkout to ${FASTDDS_PYTHON_BRANCH}
251-
# Else try with current documentation branch
252-
# Else checkout to master
242+
# Else checkout to 1.4.x
253243
if (fastdds_python_branch and
254244
fastdds_python.refs.__contains__(
255245
'origin/{}'.format(fastdds_python_branch))):
256246
fastdds_python_branch = 'origin/{}'.format(fastdds_python_branch)
257-
elif (docs_branch and
258-
fastdds_python.refs.__contains__('origin/{}'.format(docs_branch))):
259-
fastdds_python_branch = 'origin/{}'.format(docs_branch)
260247
else:
261-
print(
262-
'Fast DDS Python does not have either "{}" or "{}" branches'
263-
.format(fastdds_python_branch, docs_branch))
264-
fastdds_python_branch = 'origin/main'
248+
fastdds_python_branch = 'origin/1.4.x'
249+
print(f'Fast DDS Python branch is not set by env var. Using "{fastdds_python_branch}"')
265250

266251
# Actual checkout
267252
print('Checking out Fast DDS Python branch "{}"'.format(

0 commit comments

Comments
 (0)