Skip to content

[24136] Update fallback branches in conf.py #1271

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MiguelCompany merged 2 commits into from
Jun 17, 2026
Merged

[24136] Update fallback branches in conf.py #1271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
26426db
Update fallback branches in conf.py
MiguelCompany Jun 17, 2026
3134a63
Update to Ubuntu 22.04 in readthedocs.yaml
MiguelCompany Jun 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions docs/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,10 +323,10 @@ def configure_doxyfile(

# Resolve GitHub link branches: env var → current docs branch → default.
# Computed here so they are available both in the ReadTheDocs clone block and in extlinks.
fastdds_fallback_branch = resolve_fallback_branch("FASTDDS_BRANCH", docs_branch, "master")
fastdds_docs_fallback_branch = resolve_fallback_branch("FASTDDS_DOCS_BRANCH", docs_branch, "master")
fastdds_python_fallback_branch = resolve_fallback_branch("FASTDDS_PYTHON_BRANCH", docs_branch, "master")
fastdds_gen_fallback_branch = resolve_fallback_branch("FASTDDS_GEN_BRANCH", docs_branch, "master")
fastdds_fallback_branch = resolve_fallback_branch("FASTDDS_BRANCH", docs_branch, "3.4.x")
fastdds_docs_fallback_branch = resolve_fallback_branch("FASTDDS_DOCS_BRANCH", docs_branch, "3.4.x")
fastdds_python_fallback_branch = resolve_fallback_branch("FASTDDS_PYTHON_BRANCH", docs_branch, "2.4.x")
fastdds_gen_fallback_branch = resolve_fallback_branch("FASTDDS_GEN_BRANCH", docs_branch, "4.2.x")

print("Fallback branches for GitHub links:")
print(' Fast-DDS: "{}"'.format(fastdds_fallback_branch))
Expand Down Expand Up @@ -376,7 +376,7 @@ def configure_doxyfile(
fastdds_branch
)
)
fastdds_branch = "origin/master"
fastdds_branch = "origin/3.4.x"

# Actual checkout
print('Checking out Fast DDS branch "{}"'.format(fastdds_branch))
Expand All @@ -399,7 +399,7 @@ def configure_doxyfile(
fastdds_python_branch
)
)
fastdds_python_branch = "origin/main"
fastdds_python_branch = "origin/2.4.x"

# Actual checkout
print('Checking out Fast DDS Python branch "{}"'.format(fastdds_python_branch))
Expand Down
2 changes: 1 addition & 1 deletion readthedocs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
version: 2

build:
os: ubuntu-20.04
os: ubuntu-22.04
tools:
python: "3.11"
apt_packages:
Expand Down
Loading