Skip to content

Commit

Permalink
Add logic for excluding group workaround dependencies (#1040)
Browse files Browse the repository at this point in the history
  • Loading branch information
cottsay authored Jun 5, 2024
1 parent 1836bae commit d52a968
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions ros_buildfarm/release_job.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,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 @@ -346,7 +347,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 @@ -359,6 +361,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 @@ -460,7 +464,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

0 comments on commit d52a968

Please sign in to comment.