Skip to content

Commit

Permalink
Switch from VCS to submodules (#12)
Browse files Browse the repository at this point in the history
* remove currently-unused mujoco dependency

* switch to submodules

* remove vcs docker step

* checkout submodules too

* fix clang tidy when PR doesn't change cpp files
  • Loading branch information
henrygerardmoore authored Dec 13, 2024
1 parent e46c7b3 commit fd1aaec
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 22 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ jobs:
steps:
- name: Checkout source
uses: actions/checkout@v4
with:
submodules: 'true'

- name: Setup Docker Buildx
uses: docker/setup-buildx-action@v2
Expand Down Expand Up @@ -90,7 +92,8 @@ jobs:
files: |
**.cpp
**.hpp
- run: run-clang-tidy -j $(nproc --all) -p build/ -export-fixes clang-tidy-fixes.yaml -config-file src/fuse/.clang-tidy ${{ steps.changed-cpp-files.outputs.all_changed_files }}
- if: ${{ steps.changed-cpp-files.outputs.all_changed_files != '' }}
run: run-clang-tidy -j $(nproc --all) -p build/ -export-fixes clang-tidy-fixes.yaml -config-file src/fuse/.clang-tidy ${{ steps.changed-cpp-files.outputs.all_changed_files }}
working-directory: /colcon_ws
- uses: asarium/[email protected]
with:
Expand Down
6 changes: 6 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[submodule "dependencies/tf2_2d"]
path = dependencies/tf2_2d
url = https://github.com/locusrobotics/tf2_2d.git
[submodule "dependencies/covariance_geometry_ros"]
path = dependencies/covariance_geometry_ros
url = https://github.com/giafranchini/covariance_geometry_ros.git
3 changes: 1 addition & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
--mount=type=cache,target=/var/lib/apt,sharing=locked \
apt-get update && apt-get upgrade -y && \
. /opt/ros/rolling/setup.sh && \
vcs import src --input src/fuse/fuse.repos && \
rosdep install --from-paths src -y --ignore-src --skip-keys=mujoco && \
rosdep install --from-paths src -y --ignore-src && \
colcon build --mixin compile-commands coverage-gcc coverage-pytest

# Set up final environment and entrypoint.
Expand Down
1 change: 1 addition & 0 deletions dependencies/covariance_geometry_ros
1 change: 1 addition & 0 deletions dependencies/tf2_2d
Submodule tf2_2d added at 41b3d5
13 changes: 0 additions & 13 deletions fuse.repos

This file was deleted.

10 changes: 5 additions & 5 deletions fuse_models/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ find_package(tf2 REQUIRED)
find_package(tf2_2d REQUIRED)
find_package(tf2_geometry_msgs REQUIRED)
find_package(tf2_ros REQUIRED)
find_package(mujoco REQUIRED)
# find_package(mujoco REQUIRED)

find_package(Ceres REQUIRED)
find_package(Eigen3 REQUIRED)
Expand All @@ -47,7 +47,7 @@ add_library(
src/graph_ignition.cpp
src/imu_2d.cpp
src/imu_3d.cpp
src/mujoco_model.cpp
# src/mujoco_model.cpp
src/odometry_2d.cpp
src/odometry_2d_publisher.cpp
src/odometry_3d.cpp
Expand Down Expand Up @@ -77,7 +77,7 @@ target_link_libraries(
fuse_publishers::fuse_publishers
fuse_variables::fuse_variables
${geometry_msgs_TARGETS}
mujoco::mujoco
# mujoco::mujoco
${nav_msgs_TARGETS}
pluginlib::pluginlib
rclcpp_components::component
Expand Down Expand Up @@ -136,7 +136,7 @@ ament_export_dependencies(
tf2_ros
Ceres
Eigen3
Boost
mujoco)
Boost)
# mujoco)

ament_package()
2 changes: 1 addition & 1 deletion fuse_models/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<depend>boost</depend>
<depend>libceres-dev</depend>
<depend>eigen</depend>
<depend>mujoco</depend>
<!-- <depend>mujoco</depend> -->

<build_depend>covariance_geometry_ros</build_depend>
<build_depend>fuse_constraints</build_depend>
Expand Down

0 comments on commit fd1aaec

Please sign in to comment.