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

Patch 0.20.1 build #400

Closed
marip8 opened this issue Oct 24, 2023 · 4 comments
Closed

Patch 0.20.1 build #400

marip8 opened this issue Oct 24, 2023 · 4 comments

Comments

@marip8
Copy link
Contributor

marip8 commented Oct 24, 2023

Building 0.20.1 of this repo with 0.20.1 of tesseract results in a build failure because the header clean up from tesseract-robotics/tesseract#946 removed some headers that were implicitly included in tesseract_planning. This issue was fixed in #394, but only after breaking changes were introduced in this repo to support a later version of trajopt.

What is the right way of patching the 0.20.1 build to include this fix? Separate branch, re-arrange commits on master branch?

@Levi-Armstrong
Copy link
Contributor

I would create a branch from the 0.20.1 tag and apply the patch then create a 0.20.2 tag from this branch then the branch can be deleted.

@Levi-Armstrong
Copy link
Contributor

I don't think you will be able to use the catkin_prepare_release but you should be able to use the catkin_generate_changelog to update the change log and then manually push to the patch branch and then create tag.

@marip8
Copy link
Contributor Author

marip8 commented Oct 24, 2023

I would create a branch from the 0.20.1 tag and apply the patch then create a 0.20.2 tag from this branch then the branch can be deleted.

I thought of this last night as well; I'll give it a shot

@marip8
Copy link
Contributor Author

marip8 commented Oct 24, 2023

Closing; I think this should work fine

@marip8 marip8 closed this as completed Oct 24, 2023
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

No branches or pull requests

2 participants