-
Notifications
You must be signed in to change notification settings - Fork 788
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
Merge Master into ROS2 #245
Conversation
…ster' [grid_map ]Import PR 'explicit initialization of member variables'. GitOrigin-RevId: b2c45c0d6a23048fda8e56835c77b9f03fa48437
[grid_map_cv] Fix open cv to moved grid map conversion. GitOrigin-RevId: 50016100e952afe7990ecf6fea2489ee99baf039
@remod where did you branch ros2 from? It looks like you have some merge conflicts and your branch was older than when we setup CI so CircleCI is failing. You could cherry-pick your commit range over or rebase. |
Hm, it only has the changes it should have. So CircleCi fails with:
This looks to me more like a basic issue. |
That's why I'm saying I think its a base issue. There's even merge conflicts, I think their local version was really old. They should cherry pick or rebase. |
@SteveMacenski |
Perhaps, yes. I do think trying to cherry pick the commits over one by one would be fine. |
Cherry-picking leads to the same merge conflicts, as you cannot apply commits 1-1 if the formatting changed... |
update cmake minimum version from 2.8.3 to 3.5.1 GitOrigin-RevId: 3719820fca7758e5ce1feee3409a3cc6b0af17a3
if you cherry-picked locally, you would have been asked to resolve these conflicts in the terminal. Since they appear here, I don't think you did that correctly. I see a marge into master rather than a cherry pick on a clean branch. |
Yes, it's clear that I can resolve the conflicts locally. However, it does not seem scale well if we have merge conflicts with every little fix we do on master. Does it make sense to reformat master as well? |
We could certainly do that, yes. The uncrustify errors can be automatically reformatted which will do the bulk of the work, but there's probably a solid day of linting for the cpplint compliance. Keep in mind you'll still have merge conflicts regardless because the ROS APIs and structure have changed so much, but it would be lessor |
[devops] Rename all readme's to Readme. Closes #UNKNOWN GitOrigin-RevId: 9f3c130b2d28097a7744cb33140346f11c6c3c3d
[grid_map_*] Added test coverage macros GitOrigin-RevId: bf45cb1ee9c9c52707e7316070ef191116c438fa
[grid_map] Added cmake code coverage macro GitOrigin-RevId: d9e32d7a3a6e0c507a1759df2ba23e906a548e70
[grid_map] Fix for getIndex() function in cases of suboptimal position arguments Closes #UNKNOWN GitOrigin-RevId: 740443e4f3aad9fe495a565b557b3e46cd22e417
[grid_map] Enabled again unit coverage analysis GitOrigin-RevId: a9d12bb7dd5c3b8d2e4085ea58226663309f0784
…ter' [perception demo pkgs] Added unit coverage analysis macros GitOrigin-RevId: 156263bdddd5c16e679df452ab7936066570f3d1
[multiple] Added missing depends in package.xml GitOrigin-RevId: b8f033a80d568bd4b678bf568685593733e0636a
[multiple] Added empty test to Perception pkgs that didn't have it GitOrigin-RevId: 74cc619d9a88f9334b59a3a1d482e83264529ffb
[grid_map*] Executables are also counted for coverage, updated cmake GitOrigin-RevId: a2df6f2718b885c52de7fd267d757f108c7eb019
[grid_map_filters] Additional Filter - Median Fill Filter GitOrigin-RevId: 5d9ee2fba06eecd15180eec8d2186b6d1bc4cfd5
Congratulations 🎉. DeepCode analyzed your code in 2.666 seconds and we found no issues. Enjoy a moment of no bugs ☀️. 👉 View analysis in DeepCode’s Dashboard | Configure the bot👉 The DeepCode service and API will be deprecated in August, 2021. Here is the information how to migrate. Thank you for using DeepCode 🙏 ❤️ !If you are using our plugins, you might be interested in their successors: Snyk's JetBrains plugin and Snyk's VS Code plugin. |
Feature/noetic Closes #UNKNOWN and #UNKNOWN GitOrigin-RevId: 960d8e58290245ef1cf393dde684cc786d01752d
[grid_map_filters] Fix package version Closes #UNKNOWN GitOrigin-RevId: 271a4052c6aae9f0debebdb25542a574d05f1ad6
[grid_map_filters] Fix rosdep key of gmock. GitOrigin-RevId: 9f30018d22fa1e7f69aae267c00e05fdc5f11275
removed notes about melodic from variouos readmes Closes #UNKNOWN GitOrigin-RevId: 1439d66dc974f4ff1c33b4fef7430081c74e92bb
[grid_map] Optimize get transformed map Closes #UNKNOWN GitOrigin-RevId: c468aac9cdbae996e989a62d89603e09cad89140
Fix TBB version to Ubuntu 20.04 version Closes #UNKNOWN and #UNKNOWN GitOrigin-RevId: e1412ebe1ad08ac1215bf819e71a5c909ebad42a
[grid map core] Reduce clang warnings GitOrigin-RevId: 0b01ff34cd31833b65f4718fab82467f11332938
Rsl/feature/grid map sdf GitOrigin-RevId: 3b81429fa28b24149d8ea22f16cfc5c9d1b5c0a8
[grid_map] Fix package version GitOrigin-RevId: cec3640405f00ade48b5426a54597f632699b8e4
GitOrigin-RevId: a6b0e9f7981ce7fdf8387ac8503701b040d9f7fd
… 'master' [grid_map_core] removed more clang warnings. GitOrigin-RevId: 967411d912d34b4714656801373419c765a3afd8
GitOrigin-RevId: 3c94b85701fc8092dfa4bac02722439a58e6a63c
GitOrigin-RevId: 81716deb102b79af979516e3bbf1502e5d3f7714
GitOrigin-RevId: 6eb1661e21882191caeeb777de5157fe5c715a2b
GitOrigin-RevId: bed4c80c856d2fbef5fcaae3829e16e10fdc4111
… 'master' [grid_map_rviz_plugin] Fix not showing until toggled & fix Color Transformer None GitOrigin-RevId: 107e799be4176100c6d4018ec68ebf2e22407ee9
[grid_map_rviz_plugin] Add anybotics color map. GitOrigin-RevId: 41e615c092f397f26577546baea4546d442d0e34
GitOrigin-RevId: 1a750421867c10911bf73afafcac2afd49135607
Fix grid map rviz plugin crash due to non-existing layer GitOrigin-RevId: 84ad91c8816c0b69fdd4b1501f91864bcf1a376d
remove isReset_ in favour of isEnabled, add a check on reset to re-enable the... Closes #UNKNOWN GitOrigin-RevId: 573e10ee99627bd6dfc3bd960912cd596d86da85
GitOrigin-RevId: cbd1bb5a9a24e1be6ef8df9255212d6c7297e75c
GitOrigin-RevId: 58e194a10f164ab8210c909c59f3afaac4fb90ff
GitOrigin-RevId: 7a9f1f11a59c06d0a7acb100347b6696a516b92f
GitOrigin-RevId: 19d842eb6c5de548cd2d1a599b11318fe3aed34f
GitOrigin-RevId: 6f6a4025d4b39d47ad832b76eeee919a53a2d64a
[anymal_state_estimator_tsif, others] Move to C++17 GitOrigin-RevId: 448a39e47a525da90edcb2a8babbc449a4ab6169
GitOrigin-RevId: 3cd6089814912a039f1612cf4ed02c914cbf2db8
GitOrigin-RevId: 902f0289b026b4543cdff4d099236c802e795b44
I've marked this for 2.2.0 milestone, but needs an overhaul to only include the critical bugfixes. The rest can be kicked out to a later release. |
GitOrigin-RevId: 4ec6a52059510869ead621ffde76f516c7776221
GitOrigin-RevId: 3c170d09e6c213ac715b9a9a46d9105a36432099
Merging fixes from master into the ros2 branch.