Skip to content

fix: strip the ros2- prefix from GHA job names too, and list each package once #177

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
Tobias-Fischer merged 1 commit into from
Oct 22, 2026
Merged

fix: strip the ros2- prefix from GHA job names too, and list each package once #177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 8 additions & 4 deletions vinca/generate_gha.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,12 +159,16 @@ def dump_for_gha(doc, f):


def get_stage_name(batch):
legacy_prefix = f"ros-{config.ros_distro}-"
"""Job name: the batch's packages without their ros-<distro>- or ros2- prefix, each
once (with package_name_mode: both a package has a recipe under either name)."""
prefixes = (f"ros-{config.ros_distro}-", "ros2-")
stage_name = []
for pkg in batch:
if pkg.startswith(legacy_prefix):
stage_name.append(pkg[len(legacy_prefix) :])
else:
for prefix in prefixes:
if pkg.startswith(prefix):
pkg = pkg[len(prefix) :]
break
if pkg not in stage_name:
stage_name.append(pkg)
return " ".join(stage_name)

Expand Down
16 changes: 9 additions & 7 deletions vinca/test_generate_gha.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,21 @@ def rolling_distro():
[
("ros-rolling-rclcpp", "rclcpp"),
("ros-rolling-ament-package", "ament-package"),
("ros2-rclcpp", "ros2-rclcpp"),
("ros2-ament-package", "ros2-ament-package"),
("ros2-distro-mutex", "ros2-distro-mutex"),
("ros2-rclcpp", "rclcpp"),
("ros2-ament-package", "ament-package"),
("ros2-distro-mutex", "distro-mutex"),
("ros2-ros2-control", "ros2-control"),
("ros2cli", "ros2cli"),
("ros-humble-rclcpp", "ros-humble-rclcpp"),
],
)
def test_get_stage_name_strips_only_the_legacy_prefix(package, expected):
def test_get_stage_name_strips_the_package_prefix(package, expected):
assert get_stage_name([package]) == expected


def test_get_stage_name_joins_a_batch():
batch = ["ros-rolling-rclcpp", "ros2-ament-package"]
assert get_stage_name(batch) == "rclcpp ros2-ament-package"
def test_get_stage_name_joins_a_batch_and_lists_each_package_once():
batch = ["ros2-rclcpp", "ros-rolling-rclcpp", "ros2-ament-package"]
assert get_stage_name(batch) == "rclcpp ament-package"


def test_unix_pipeline_sets_up_pixi(tmp_path):
Expand Down
Loading