Merge pull request #508 from ROBOTIS-GIT/ros2-devel

Ros2 devel
ROBOTIS-GIT · Jun 21, 2021 · 2446246 · 2446246
2 parents f212c28 + 9070018
commit 2446246
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/.github/workflows/ros-ci.yml b/.github/workflows/ros-ci.yml
@@ -3,9 +3,9 @@ name: ros2-ci
 # Controls when the action will run. Triggers the workflow on push or pull request
 on:
   push:
-    branches: [ ros2, ros2-devel ]
+    branches: [ ros2, ros2-devel, foxy, galactic ]
   pull_request:
-    branches: [ ros2, ros2-devel ]
+    branches: [ ros2, ros2-devel, foxy, galactic ]
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
@@ -15,23 +15,23 @@ jobs:
       fail-fast: false
       matrix:
         ros_distribution:
-          - dashing
+          # - dashing
           - foxy
-          # - galactic
+          - galactic
           - rolling
         include:
             # Dashing Diademata (May 2019 - May 2021)
-          - docker_image: ubuntu:bionic
-            ros_distribution: dashing
-            ros_version: 2
+          # - docker_image: ubuntu:bionic
+          #   ros_distribution: dashing
+          #   ros_version: 2
             # Foxy Fitzroy (June 2020 - May 2023)
           - docker_image: ubuntu:focal
             ros_distribution: foxy
             ros_version: 2
             # Galactic Geochelone (May 2021)
-          # - docker_image: ubuntu:focal
-          #   ros_distribution: galactic
-          #   ros_version: 2
+          - docker_image: ubuntu:focal
+            ros_distribution: galactic
+            ros_version: 2
             # Rolling
           - docker_image: ubuntu:focal
             ros_distribution: rolling
@@ -46,7 +46,7 @@ jobs:
         with:
           path: ros_ws/src
       - name: Setup ROS environment
-        uses: ros-tooling/setup-ros@0.1.2
+        uses: ros-tooling/setup-ros@0.2.1
         with:
           required-ros-distributions: ${{ matrix.ros_distribution }}
       - name: Build and Test

diff --git a/dynamixel_sdk_custom_interfaces/package.xml b/dynamixel_sdk_custom_interfaces/package.xml
@@ -14,6 +14,7 @@
   <url type="bugtracker">https://github.com/ROBOTIS-GIT/DynamixelSDK/issues</url>
   <buildtool_depend>ament_cmake</buildtool_depend>
   <buildtool_depend>rosidl_default_generators</buildtool_depend>
+  <build_depend>builtin_interfaces</build_depend>
   <exec_depend>builtin_interfaces</exec_depend>
   <exec_depend>rosidl_default_runtime</exec_depend>
   <member_of_group>rosidl_interface_packages</member_of_group>