Skip to content
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

Jump to bottom

Add logic for excluding group workaround dependencies #1040

Merged
merged 1 commit into from
Jun 5, 2024
Merged

Add logic for excluding group workaround dependencies #1040

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
11 changes: 8 additions & 3 deletions ros_buildfarm/release_job.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,8 @@ def configure_release_jobs(
cached_pkgs = _get_and_parse_distribution_cache(
index, rosdistro_name, pkg_names,
include_test_deps=build_file.include_test_dependencies,
include_group_deps=build_file.include_group_dependencies)
include_group_deps=build_file.include_group_dependencies,
disable_groups_workaround=build_file.include_group_dependencies)
filtered_pkg_names = build_file.filter_packages(pkg_names)
explicitly_ignored_without_recursion_pkg_names = \
set(pkg_names) & set(build_file.package_ignore_list)
Expand Down Expand Up @@ -345,7 +346,8 @@ def configure_release_jobs(


def _get_and_parse_distribution_cache(
index, rosdistro_name, pkg_names, include_test_deps, include_group_deps
index, rosdistro_name, pkg_names, include_test_deps, include_group_deps,
disable_groups_workaround,
):
from catkin_pkg.package import parse_package_string
from catkin_pkg.package import Dependency
Expand All @@ -358,6 +360,8 @@ def _get_and_parse_distribution_cache(
}

condition_context = get_package_condition_context(index, rosdistro_name)
if disable_groups_workaround:
condition_context['DISABLE_GROUPS_WORKAROUND'] = '1'
for pkg in cached_pkgs.values():
pkg.evaluate_conditions(condition_context)
for pkg in cached_pkgs.values():
Expand Down Expand Up @@ -459,7 +463,8 @@ def configure_release_job(
cached_pkgs = _get_and_parse_distribution_cache(
index, rosdistro_name, [pkg_name],
include_test_deps=build_file.include_test_dependencies,
include_group_deps=build_file.include_group_dependencies)
include_group_deps=build_file.include_group_dependencies,
disable_groups_workaround=build_file.include_group_dependencies)
if jenkins is None:
from ros_buildfarm.jenkins import connect
jenkins = connect(config.jenkins_url)
Expand Down
Loading