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

Update to libphidgets 20220203 #138

Merged
merged 1 commit into from
Apr 13, 2022
Merged

Conversation

clalancette
Copy link
Contributor

Signed-off-by: Chris Lalancette clalancette@openrobotics.org

This should fix #133 , and also update us to the latest libphidget code from upstream.

I've targeted this at the galactic branch, but I actually think we should leave Galactic as it is and make a new, separate branch for Rolling. Then I'll retarget this at that new branch. @mintar what do you think?

Signed-off-by: Chris Lalancette <clalancette@openrobotics.org>
@clalancette clalancette requested a review from mintar April 11, 2022 13:04
Copy link
Contributor

@mintar mintar left a comment

Choose a reason for hiding this comment

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

LGTM! Also +1 on creating a new rolling branch. Or we could create a "humble" branch instead and release that to rolling and humble (same as we did with the galactic branch so far).

@clalancette
Copy link
Contributor Author

Also +1 on creating a new rolling branch. Or we could create a "humble" branch instead and release that to rolling and humble (same as we did with the galactic branch so far).

What we've been finding is that with the advent of Rolling, it is better to have a separate branch for Rolling, and then a single branch for each released distribution. It is a bit more work in terms of porting things back and forth, but it makes it much easier for everyone to understand what branch corresponds to what.

So my proposal is to create a rolling branch right now, and retarget this PR to it. Once we officially branch off Humble (next week sometime), we can create a humble branch. What do you think?

@mintar
Copy link
Contributor

mintar commented Apr 12, 2022

Yes, sounds good! This is more or less how I'm doing it with the ROS1 branches in my repos as well. Let's do it!

@clalancette clalancette changed the base branch from galactic to rolling April 13, 2022 17:00
@clalancette clalancette merged commit 9b679fa into rolling Apr 13, 2022
@clalancette clalancette deleted the clalancette/update-libphidgets branch April 13, 2022 17:04
@mintar
Copy link
Contributor

mintar commented May 24, 2022

So my proposal is to create a rolling branch right now, and retarget this PR to it. Once we officially branch off Humble (next week sometime), we can create a humble branch.

Now that humble is released and there are Docker images for it, we should do this.

  • Create a humble branch that we keep synced to the rolling branch for now.
  • Update the github-actions.yml build matrix to rosdistro: [humble, rolling].
  • Update the rosdep humble/distribution.yaml to point to the humble branch.

Agreed?

@clalancette : Since you're the ROS2 maintainer of this repo, I'll leave this to you. Unless you want me to do it.

@clalancette
Copy link
Contributor Author

@clalancette : Since you're the ROS2 maintainer of this repo, I'll leave this to you. Unless you want me to do it.

I'll go ahead and make the branch, though I'm not entirely sure we should keep them synced and using the same matrix. That is, it would be simpler to just have the humble branch test against humble, and the rolling branch against rolling. It requires a bit more work to backport everything, but I think it is much simpler for users to understand.

Regardless, I'll create a humble branch (based off of rolling), then open a PR where we can discuss further.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants