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.

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

WaitForTopics: get content of messages for each topic (backport #353) #389

Merged
merged 2 commits into from
Jan 20, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jan 16, 2024

This is an automatic backport of pull request #353 done by Mergify.
Cherry-pick of 2d125a5 has failed:

On branch mergify/bp/humble/pr-353
Your branch is up to date with 'origin/humble'.

You are currently cherry-picking commit 2d125a5.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   launch_testing_ros/launch_testing_ros/wait_for_topics.py
	both modified:   launch_testing_ros/test/examples/wait_for_topic_launch_test.py

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

Copy link
Contributor

@adityapande-1995 adityapande-1995 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM with full green CI

@Ryanf55
Copy link

Ryanf55 commented Jan 17, 2024

LGTM with full green CI

There were conflicts. Do you want me to push a commit to resolve them?

@adityapande-1995
Copy link
Contributor

Yup, that would be great, thanks !

@Ryanf55
Copy link

Ryanf55 commented Jan 17, 2024

Sorry, I got sidetracked. colcon test fails because this bug that hasn't made it into a release, and missed the humble sync in January.
ament/ament_lint#464

Then, I tried to run the release myself and ran into this bug in bloom.
ros-infrastructure/bloom#722

So, I compiled bloom and ament_lint from source, and then ran into this issue.
ament/ament_lint#437 (comment)

Regardless, here's the fixes. I can't push to the branch, so I made a PR. I had to use docker to test it because host OS has different behavior than ros:humble.
#390

LastStarDust and others added 2 commits January 17, 2024 08:06
* Get content of topic from launch_testing_ros::WaitForTopics
#346
Signed-off-by: Pintaudi Giorgio <[email protected]>
---------

Signed-off-by: Pintaudi Giorgio <[email protected]>
(cherry picked from commit 2d125a5)

# Conflicts:
#	launch_testing_ros/launch_testing_ros/wait_for_topics.py
#	launch_testing_ros/test/examples/wait_for_topic_launch_test.py
Signed-off-by: Aditya Pande <[email protected]>
Signed-off-by: Ryan Friedman <[email protected]>
Signed-off-by: Aditya Pande <[email protected]>
@adityapande-1995 adityapande-1995 force-pushed the mergify/bp/humble/pr-353 branch from cadfbab to 365f968 Compare January 17, 2024 08:07
@adityapande-1995
Copy link
Contributor

  • Linux Build Status
  • Linux-aarch64 Build Status
  • Windows Build Status

@clalancette
Copy link
Contributor

Sorry, I got sidetracked. colcon test fails because this bug that hasn't made it into a release, and missed the humble sync in January.

No, that shouldn't be the case. We always use the debian packages for the tests, which is version 4.0.1. And looking at the test failures, they aren't failing because of the flake8 version. Something else is going on here.

@Ryanf55
Copy link

Ryanf55 commented Jan 17, 2024

Sorry, I got sidetracked. colcon test fails because this bug that hasn't made it into a release, and missed the humble sync in January.

No, that shouldn't be the case. We always use the debian packages for the tests, which is version 4.0.1. And looking at the test failures, they aren't failing because of the flake8 version. Something else is going on here.

Should I make a new ticket?

@clalancette
Copy link
Contributor

Should I make a new ticket?

I don't think so; whatever is happening here seems to be because of this PR.

@Ryanf55
Copy link

Ryanf55 commented Jan 17, 2024

Should I make a new ticket?

I don't think so; whatever is happening here seems to be because of this PR.

Interesting idea. Not sure if you saw, but I did get colcon test to pass in #390, which I demonstrated in a docker ros:humble container. The latest CI logs say there are conflicts on the VCS checkout which doesn't make sense because I fixed them.

@clalancette
Copy link
Contributor

Interesting idea. Not sure if you saw, but I did get colcon test to pass in #390, which I demonstrated in a docker ros:humble container. The latest CI logs say there are conflicts on the VCS checkout which doesn't make sense because I fixed them.

Oh, that's because this was run with the rolling ros2.repos, not the humble one. CI needs to be rerun against humble.

@Ryanf55
Copy link

Ryanf55 commented Jan 19, 2024

Interesting idea. Not sure if you saw, but I did get colcon test to pass in #390, which I demonstrated in a docker ros:humble container. The latest CI logs say there are conflicts on the VCS checkout which doesn't make sense because I fixed them.

Oh, that's because this was run with the rolling ros2.repos, not the humble one. CI needs to be rerun against humble.

Can anyone do this? I don't see how, and it would be great to get this in.

@mjcarroll
Copy link
Member

mjcarroll commented Jan 19, 2024

Usign https://raw.githubusercontent.com/ros2/ros2/humble/ros2.repos

  • Linux Build Status
  • Linux-aarch64 Build Status
  • Windows Build Status

@mjcarroll
Copy link
Member

Trying again, actually setting platforms to use humble deps:

  • Linux Build Status
  • Linux-aarch64 Build Status
  • Windows Build Status

@mjcarroll mjcarroll merged commit 3330171 into humble Jan 20, 2024
2 of 3 checks passed
@delete-merged-branch delete-merged-branch bot deleted the mergify/bp/humble/pr-353 branch January 20, 2024 16:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants