fix tf2_2d dep and remove workaround (#17)

PickNikRobotics · Jan 29, 2025 · 19d5703 · 19d5703
1 parent df241aa
commit 19d5703
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "dependencies/tf2_2d"]
 	path = dependencies/tf2_2d
-	url = https://github.com/locusrobotics/tf2_2d.git
+	url = https://github.com/henrygerardmoore/tf2_2d.git
 [submodule "dependencies/covariance_geometry_ros"]
 	path = dependencies/covariance_geometry_ros
 	url = https://github.com/giafranchini/covariance_geometry_ros.git
diff --git a/Dockerfile b/Dockerfile
@@ -27,9 +27,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
     . /opt/ros/humble/setup.sh && \
     rosdep install --from-paths src -y --ignore-src && \
     # tf2_2d testing build fails due to upstream tf2 changes, it seems
-    colcon build --mixin compile-commands coverage-gcc coverage-pytest build-testing-off --packages-select tf2_2d && \
-    source install/setup.bash && \
-    colcon build --mixin compile-commands coverage-gcc coverage-pytest --packages-ignore tf2_2d
+    colcon build --mixin compile-commands coverage-gcc coverage-pytest
 
 # Set up final environment and entrypoint.
 ENV RMW_IMPLEMENTATION rmw_cyclonedds_cpp

diff --git a/dependencies/tf2_2d b/dependencies/tf2_2d
+4 −0		CMakeLists.txt
+1 −1		include/tf2_2d/rotation.hpp
+1 −1		include/tf2_2d/vector2.hpp