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

[melodic] Fix Windows build break. #557

Merged
merged 5 commits into from
Apr 27, 2020

Conversation

seanyen
Copy link

@seanyen seanyen commented Apr 22, 2020

Verified with https://aka.ms/ros Windows build.

@seanyen
Copy link
Author

seanyen commented Apr 22, 2020

@SteveMacenski This is ready for review and merge. Thanks!

@SteveMacenski
Copy link
Collaborator

LGTM but I mostly leave ROS1 things to Tom. Might be better targeted for a Noetic branch so that there's no breakage on a new release.

@seanyen
Copy link
Author

seanyen commented Apr 22, 2020

Sounds good. @ayrton04 Let me know what do you think. Perhaps we can have a noetic-devel branch first?

@SteveMacenski
Copy link
Collaborator

We'll see what he says first. I'd like to avoid extra branches to try to keep synced if possible.

@ayrton04
Copy link
Collaborator

These changes look pretty tame. I think I'd be fine with it going into Melodic.

@SteveMacenski, I've wondered if there's a better model for branch management w.r.t. ROS distros for a while. Maybe we just have a devel branch, and all distros use that until there's an ABI breakage, or we need to EOL a distribution or something?

Copy link
Collaborator

@ayrton04 ayrton04 left a comment

Choose a reason for hiding this comment

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

Thank you!

@SteveMacenski
Copy link
Collaborator

ROS1’s on its last legs so I’m not super concerned with its management. I think as long as the changes aren’t massive we can keep 1 branch for Kinetic / melodic / noetic. Reducing the maintenance overhead of LTS distro can’t be overstated IMO. Keeping multiple LTS distro branches in sync is a pain so using the same when possible is a big stress reliever.

@ayrton04
Copy link
Collaborator

Works for me.

@SteveMacenski SteveMacenski merged commit 799ad44 into cra-ros-pkg:melodic-devel Apr 27, 2020
@seanyen seanyen deleted the seanyen/windows branch April 27, 2020 20:08
@seanyen
Copy link
Author

seanyen commented Apr 27, 2020

Thanks for the merge!

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

3 participants