Skip to content

Commit

Permalink
Rollback diff w.r.t. master
Browse files Browse the repository at this point in the history
  • Loading branch information
roncapat committed Jun 13, 2023
1 parent ad8898a commit 853a940
Showing 3 changed files with 13 additions and 7 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -28,7 +28,6 @@ jobs:
rosdep update
rosdep install --from-paths ./ -i -y --rosdistro rolling \
--ignore-src
apt-get upgrade -q -y --with-new-pkgs ros-rolling-rcl
- name: Build project
id: build
run: |
@@ -47,7 +46,7 @@ jobs:
container:
image: osrf/ros:rolling-desktop
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Setup colcon workspace
id: configure
run: |
@@ -65,7 +64,6 @@ jobs:
rosdep update
rosdep install --from-paths ./ -i -y --rosdistro rolling \
--ignore-src
apt-get upgrade -q -y --with-new-pkgs ros-rolling-rcl
- name: Build project
id: build
run: |
15 changes: 12 additions & 3 deletions gazebo_ros2_control/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -31,7 +31,6 @@ add_library(${PROJECT_NAME} SHARED
)
ament_target_dependencies(${PROJECT_NAME}
angles
service_msgs
controller_manager
gazebo_dev
gazebo_ros
@@ -64,8 +63,18 @@ ament_export_include_directories(
include
)

ament_export_dependencies(ament_cmake)
ament_export_dependencies(rclcpp)
ament_export_dependencies(
ament_cmake
angles
controller_manager
gazebo_dev
gazebo_ros
hardware_interface
pluginlib
rclcpp
yaml_cpp_vendor
)

ament_export_libraries(
${PROJECT_NAME}
gazebo_hardware_plugins
1 change: 0 additions & 1 deletion gazebo_ros2_control/package.xml
Original file line number Diff line number Diff line change
@@ -19,7 +19,6 @@
<buildtool_depend>ament_cmake</buildtool_depend>

<depend>angles</depend>
<depend>service_msgs</depend>
<depend>gazebo_dev</depend>
<depend>gazebo_ros</depend>
<depend>controller_manager</depend>

0 comments on commit 853a940

Please sign in to comment.