From df36976b6994a4f6f9813b7333313aae7ecdab93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20Fr=C3=B6hlich?= Date: Mon, 25 Sep 2023 18:45:58 +0200 Subject: [PATCH] Use master for irons REPOS_FILE_BRANCH (#171) --- conf.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/conf.py b/conf.py index f0620888bea..b1064f027d9 100644 --- a/conf.py +++ b/conf.py @@ -301,6 +301,7 @@ def smv_rewrite_configs(app, config): # conf.py). Instead, hook into the 'config-inited' event which is late enough # to rewrite the various configuration items with the current version. if app.config.smv_current_version != "": + # this map is used to match branches of control.ros.org to ROS distros, e.g., DISTRO macro branch_distro = { "master": "rolling", "iron": "iron", @@ -308,10 +309,18 @@ def smv_rewrite_configs(app, config): "foxy": "foxy", "galactic": "galactic" } + # this map is used to match branches of control.ros.org to REPOS_FILE_BRANCH macro + subrepo_branch = { + "master": "master", + "iron": "master", + "humble": "humble", + "foxy": "foxy", + "galactic": "galactic" + } # Override default values - branch = app.config.smv_current_version - distro = branch_distro[branch] + branch = subrepo_branch[app.config.smv_current_version] + distro = branch_distro[app.config.smv_current_version] app.config.macros = { "DISTRO": distro, "DISTRO_TITLE": distro.title(),