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

Use ROS-independent version of ICI #861

Merged
merged 24 commits into from
Mar 14, 2023

Conversation

marip8
Copy link
Contributor

@marip8 marip8 commented Mar 9, 2023

Changes per commit message to address #834

@marip8 marip8 force-pushed the update/ros-independent-ci branch from 7147533 to 28872f2 Compare March 9, 2023 01:27
@marip8 marip8 force-pushed the update/ros-independent-ci branch from 7a1b598 to 7ebc100 Compare March 9, 2023 02:14
@marip8
Copy link
Contributor Author

marip8 commented Mar 9, 2023

It looks like the Focal builds are failing on the octomap unit test due to the issue documented in #828. Also the Bionic build can't find gtest (maybe because it is no longer being provided by ros_industrial_cmake_boilerplate?).

@Levi-Armstrong
Copy link
Contributor

It does not look like the libraries are provided on 18.04. I am fine with removing this CI build because it will be EOL in April.

@marip8 marip8 force-pushed the update/ros-independent-ci branch from c6124c1 to eac0580 Compare March 9, 2023 19:37
@marip8 marip8 force-pushed the update/ros-independent-ci branch from 9f03e8f to d571660 Compare March 9, 2023 22:38
@marip8
Copy link
Contributor Author

marip8 commented Mar 9, 2023

I merged a few of the jobs together to reduce code duplication. It's set up now to run all Ubuntu and Windows jobs in a matrix to support the same build steps for multiple distributions. I also merged the two code quality jobs (code coverage and clang tidy) in a matrix. It was getting difficult to make sure all the variables were set correctly, so this should help make introducing jobs for new distros easier

@Levi-Armstrong
Copy link
Contributor

Looks good!

@marip8
Copy link
Contributor Author

marip8 commented Mar 10, 2023

Looks like something is wrong with the Windows build since it's failed the last couple of merged PRs, but this PR should be ready for review now

@Levi-Armstrong
Copy link
Contributor

Windows is failing because I updated the ros_industrial_cmake_bolilerplate version and it no longer can find gtest.

@marip8
Copy link
Contributor Author

marip8 commented Mar 10, 2023

Should we revert to 0.3.x then? That would allow us to reintroduce the bionic build as well which some people might appreciate

@Levi-Armstrong
Copy link
Contributor

I would just add gtest to the vcpkg list

@marip8
Copy link
Contributor Author

marip8 commented Mar 10, 2023

I would just add gtest to the vcpkg list

That apparently doesn't work, unless it's under a different name than ros-industrial-cmake-boilerplate. I also can't find it on the vcpkg website

@Levi-Armstrong
Copy link
Contributor

Levi-Armstrong commented Mar 10, 2023

I would just add gtest to the vcpkg list

That apparently doesn't work, unless it's under a different name than ros-industrial-cmake-boilerplate. I also can't find it on the vcpkg website

Need to add gtest to the list and remove RICB.

@Levi-Armstrong
Copy link
Contributor

Levi-Armstrong commented Mar 10, 2023

@marip8
Copy link
Contributor Author

marip8 commented Mar 10, 2023

Ah my mistake; was stuck on RICB for some reason

@Levi-Armstrong
Copy link
Contributor

The issue now is that octomap repository is to being build first. I not sure why but it could be because it has a top level CMakeLists.txt file and colcon is not searching deeper to the sub directories which have a package.xml.

@Levi-Armstrong
Copy link
Contributor

I would just add a separate rosinstall file for windows and remove fcl and octomap. Then add fcl and octomap back to vcpkg list.

@Levi-Armstrong
Copy link
Contributor

LGTM, I recommend squash merging this when you are ready

@marip8 marip8 merged commit 4c6d64a into tesseract-robotics:master Mar 14, 2023
@marip8 marip8 deleted the update/ros-independent-ci branch March 14, 2023 01:17
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.

2 participants