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: migrate abb_driver to new repository #25545

Merged
merged 1 commit into from
Jun 23, 2020

Conversation

gavanderhoorn
Copy link
Contributor

@gavanderhoorn gavanderhoorn commented Jun 20, 2020

As per subject.

This PR combines a Bloom release of ros-industrial/abb_driver and the removal of the same packages from the ros-industrial/abb repository in a single commit.

The release entry was created manually, as Bloom doesn't let me release a package which is already part of a releases repository (and rightfully so).

@gavanderhoorn
Copy link
Contributor Author

Related: #25544.

@gavanderhoorn gavanderhoorn changed the title melodic: 'unrelease' abb_driver melodic: migrate abb_driver to new repository Jun 22, 2020
melodic/distribution.yaml Outdated Show resolved Hide resolved
This migrates abb_driver from ros-industrial/abb to ros-industrial/abb_driver.

Manual merge, as Bloom won't release an already released package from a different location.
@nuclearsandwich
Copy link
Member

I don't know if that actually works. The reason being that the "overlays" that we use in the release repository also contain the name of the Ubuntu/Debian distribution that they are being released on, and that is different between Kinetic and Melodic. Certainly I haven't seen this use before; @nuclearsandwich , will this work?

Short answer: I think it will work for rosinstall generator but cause us problems when building binarydeb packages. It looks like @gavanderhoorn has already updated the PR but for completeness here's why:

The platform- and distribution-specific information is usually found in the debian/* and rpm/* branches. The release/ branches are meant to be platform independent but still give a chance for release patches against upstream source. It's possible to add other entries to tags here: for example one specific to debian packages that points to another location, but I'm not current on whether those possible tags are actually used by current infrastructure or if they're determined by heuristic from the release tag no matter what. Bloom resolves package dependencies from the template at bloom-time so trying to use the kinetic debian metadata in melodic would result in trying (and failing) to depend on kinetic packages (e.g. ros-kinetic-catkin) rather than melodic ones. Similarly the xenial rosdep resolutions would be used for system packages.

Copy link
Member

@tfoote tfoote 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 the tags updated now.

@nuclearsandwich is right that it would break the debian builds having the wrong tags. It's the most common error when people manually create PRs instead of using the bloom ones.

@gavanderhoorn
Copy link
Contributor Author

@nuclearsandwich is right that it would break the debian builds having the wrong tags. It's the most common error when people manually create PRs instead of using the bloom ones.

I'm (and was) fully aware of this. It was simply a case of getting the release branch in the repository mixed up with the release branch in the release repository.

@clalancette clalancette merged commit acff250 into ros:master Jun 23, 2020
@gavanderhoorn gavanderhoorn deleted the patch-3 branch June 23, 2020 13:23
@ros-discourse
Copy link

This pull request has been mentioned on ROS Discourse. There might be relevant details there:

https://discourse.ros.org/t/migration-of-abb-driver-to-a-separate-repository/13522/3

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

5 participants