Skip to content

Commit

Permalink
Add Iron to multiversion build (backport #144) (#197)
Browse files Browse the repository at this point in the history
* Add iron to multiversion (#144)

Co-authored-by: Bence Magyar <[email protected]>
(cherry picked from commit e2b1e8a)
  • Loading branch information
mergify[bot] authored Nov 6, 2023
1 parent 17a443a commit b5b6424
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
3 changes: 2 additions & 1 deletion conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)$"
Expand Down Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions make_help_scripts/deploy_defines
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down

0 comments on commit b5b6424

Please sign in to comment.