From b5b64246104b371997a7de3d0b4dd023c8653ca7 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Mon, 6 Nov 2023 22:07:28 +0100 Subject: [PATCH] Add Iron to multiversion build (backport #144) (#197) * Add iron to multiversion (#144) Co-authored-by: Bence Magyar (cherry picked from commit e2b1e8aada00a4a65fd69d82a749dce1a5af70e1) --- conf.py | 3 ++- make_help_scripts/deploy_defines | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/conf.py b/conf.py index 4f24eeb898f..9c84186841b 100644 --- a/conf.py +++ b/conf.py @@ -174,7 +174,7 @@ html_sourcelink_suffix = "" -# Add branches you want to whtielist here. +# Add branches you want to whitelist here. smv_branch_whitelist = r"^(foxy|galactic|humble|iron|master)$" smv_released_pattern = r"^refs/(heads|remotes/[^/]+)/(foxy|galactic|humble|iron).*$" smv_remote_whitelist = r"^(origin)$" @@ -303,6 +303,7 @@ def smv_rewrite_configs(app, config): if app.config.smv_current_version != "": branch_distro = { "master": "rolling", + "iron": "iron", "humble": "humble", "foxy": "foxy", "galactic": "galactic" diff --git a/make_help_scripts/deploy_defines b/make_help_scripts/deploy_defines index bbe2671ae3e..7e119c94a24 100755 --- a/make_help_scripts/deploy_defines +++ b/make_help_scripts/deploy_defines @@ -16,8 +16,8 @@ api_branch="master" # definitions for multiversion # branches on which the temporary commits are created and which branch should be checked out in the subrepositories -# ["branch checked out for mutliversion"]="branch checked out for all subrepos" -declare -A branch_version=( ["foxy"]="foxy" ["galactic"]="galactic" ["humble"]="humble" ["master"]="master") # master is rolling +# ["branch checked out for multiversion"]="branch checked out for all subrepos" +declare -A branch_version=( ["foxy"]="foxy" ["galactic"]="galactic" ["humble"]="humble" ["iron"]="master" ["master"]="master") # master is rolling # the subrepos which are cloned into the branches and, optionally, their corresponding PR for checkout declare -A subrepo_url=( ["ros2_control"]="https://github.com/ros-controls/ros2_control" ["ros2_controllers"]="https://github.com/ros-controls/ros2_controllers" ["ros2_control_demos"]="https://github.com/ros-controls/ros2_control_demos" ["gazebo_ros2_control"]="https://github.com/ros-controls/gazebo_ros2_control" ["gz_ros2_control"]="https://github.com/ros-controls/gz_ros2_control")