From 1211cfd2390029e3e2aeb6e14b4f2e2eee900d7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Ferreira=20Gonz=C3=A1lez?= Date: Mon, 6 Jul 2026 10:58:45 +0200 Subject: [PATCH 1/4] Refs #25497: Partial backport of #1257 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Carlos Ferreira González --- docs/conf.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index c4f2cac64..91cd94a5d 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -369,13 +369,16 @@ def configure_doxyfile( fastdds_repo_name, ) - # Verify the desired branch actually exists in the cloned remote, falling back to master if not. + # Verify the desired branch/tag actually exists in the cloned remote, falling back to master if not. fastdds_branch = fastdds_fallback_branch if fastdds.refs.__contains__("origin/{}".format(fastdds_branch)): fastdds_branch = "origin/{}".format(fastdds_branch) + elif fastdds.tags.__contains__(fastdds_branch): + # GitPython exposes tags by bare name, e.g. "v3.6.2". + pass else: print( - 'Fast DDS does not have branch "{}"; falling back to master'.format( + 'Fast DDS does not have branch or tag "{}"; falling back to master'.format( fastdds_branch ) ) @@ -392,13 +395,16 @@ def configure_doxyfile( fastdds_python_repo_name, ) - # Verify the desired branch actually exists in the cloned remote, falling back to master if not. + # Verify the desired branch/tag actually exists in the cloned remote, falling back to master if not. fastdds_python_branch = fastdds_python_fallback_branch if fastdds_python.refs.__contains__("origin/{}".format(fastdds_python_branch)): fastdds_python_branch = "origin/{}".format(fastdds_python_branch) + elif fastdds_python.tags.__contains__(fastdds_python_branch): + # GitPython exposes tags by bare name, e.g. "v3.6.1". + pass else: print( - 'Fast DDS Python does not have branch "{}"; falling back to master'.format( + 'Fast DDS Python does not have branch or tag "{}"; falling back to master'.format( fastdds_python_branch ) ) From 4e42d18ff3e2c8b8ad6b324cce71aa6500f675ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Ferreira=20Gonz=C3=A1lez?= Date: Mon, 6 Jul 2026 11:00:11 +0200 Subject: [PATCH 2/4] Refs #25497: Update fallback branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Carlos Ferreira González --- docs/conf.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index 91cd94a5d..58b2af738 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -326,10 +326,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.2.x") +fastdds_docs_fallback_branch = resolve_fallback_branch("FASTDDS_DOCS_BRANCH", docs_branch, "3.2.x") +fastdds_python_fallback_branch = resolve_fallback_branch("FASTDDS_PYTHON_BRANCH", docs_branch, "2.3.x") +fastdds_gen_fallback_branch = resolve_fallback_branch("FASTDDS_GEN_BRANCH", docs_branch, "4.0.x") print("Fallback branches for GitHub links:") print(' Fast-DDS: "{}"'.format(fastdds_fallback_branch)) From cb051970a8d71e9596e6737fbca065d73d171f1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Ferreira=20Gonz=C3=A1lez?= Date: Mon, 6 Jul 2026 11:01:34 +0200 Subject: [PATCH 3/4] Refs #25497: Allow checkout to tags MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Carlos Ferreira González --- docs/conf.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index 58b2af738..750ff5f11 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -386,7 +386,7 @@ def configure_doxyfile( # Actual checkout print('Checking out Fast DDS branch "{}"'.format(fastdds_branch)) - fastdds.refs[fastdds_branch].checkout() + fastdds.git.checkout(fastdds_branch) # - Fast DDS Python Bindings print("Cloning Fast DDS Python Bindings") @@ -412,7 +412,7 @@ def configure_doxyfile( # Actual checkout print('Checking out Fast DDS Python branch "{}"'.format(fastdds_python_branch)) - fastdds_python.refs[fastdds_python_branch].checkout() + fastdds_python.git.checkout(fastdds_python_branch) os.makedirs(os.path.dirname(output_dir), exist_ok=True) os.makedirs(os.path.dirname(doxygen_html), exist_ok=True) From 699996f820ad480d0a333e808492623c46d12710 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Ferreira=20Gonz=C3=A1lez?= Date: Mon, 6 Jul 2026 11:14:25 +0200 Subject: [PATCH 4/4] Refs #25497: Fix python branch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Carlos Ferreira González --- docs/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/conf.py b/docs/conf.py index 750ff5f11..9de6baf31 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -328,7 +328,7 @@ def configure_doxyfile( # 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, "3.2.x") fastdds_docs_fallback_branch = resolve_fallback_branch("FASTDDS_DOCS_BRANCH", docs_branch, "3.2.x") -fastdds_python_fallback_branch = resolve_fallback_branch("FASTDDS_PYTHON_BRANCH", docs_branch, "2.3.x") +fastdds_python_fallback_branch = resolve_fallback_branch("FASTDDS_PYTHON_BRANCH", docs_branch, "2.2.x") fastdds_gen_fallback_branch = resolve_fallback_branch("FASTDDS_GEN_BRANCH", docs_branch, "4.0.x") print("Fallback branches for GitHub links:")