Skip to content

37 fix setup file layout #38

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
kilian-funk-apexai merged 2 commits into from
May 30, 2025
Merged

37 fix setup file layout #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3699366
Fix extra lines in setup file
revati-naik-apex May 30, 2025
6ef0dc3
Fix repos filename ins etup file
revati-naik-apex May 30, 2025
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
8 changes: 3 additions & 5 deletions repos/config/detail/generate_ros2_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ def print_setup(repos, output_file, repos_file, overlay_files, workspace_name, u
#
# To update, call `{BZL_CMD}` with the right distro set in the WORKSPACE
#
# SHA256 of @{workspace_name}//:ros.repos: {get_sha256sum(repos_file)}
# SHA256 of @{workspace_name}//:{repos_file}: {get_sha256sum(repos_file)}
# SHA256 of overlays:
#{', '.join([f' @{workspace_name}//:{os.path.basename(overlay)}: {get_sha256sum(overlay)}' for overlay in overlay_files]) if overlay_files else ""}

Expand Down Expand Up @@ -83,7 +83,7 @@ def build_list_attr(name, list_attr):
if not list_attr:
return ""
content = '\n'.join(f' "{i}",' for i in list_attr)
return f"""{name} = [
return f"""\n{name} = [
{content}
],"""

Expand All @@ -96,9 +96,7 @@ def build_http_archive_load_command(repo, spec):
url = "{spec['url']}",
sha256 = "{spec['hash']}",
strip_prefix = "{spec['strip_prefix']}",
repo_rule = http_archive,
{build_list_attr('patches', spec.get('patches'))}
{build_list_attr('patch_args', spec.get('patch_args'))}
repo_rule = http_archive,{build_list_attr('patches', spec.get('patches'))}{build_list_attr('patch_args', spec.get('patch_args'))}
)
"""

Expand Down
2 changes: 1 addition & 1 deletion repos/config/setup_humble.lock.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
# To update, call `bazel run @ros2_config//:repos_lock.update` with the right distro set in the WORKSPACE
#
# SHA256 of @ros2_config//:ros.repos: 09a14ede568810d8120e3f3228af03a35c192cff5c718422cb2d88c5cd4b2824
# SHA256 of @ros2_config//:external/ros2_config/ros.repos: 09a14ede568810d8120e3f3228af03a35c192cff5c718422cb2d88c5cd4b2824
# SHA256 of overlays:
# @ros2_config//:overlay_0.bzl: 43155011b10a9af3dce4fa93380de34278ab3a639a3e7a8932aefed2383a49e8

Expand Down