Skip to content

Commit 2446246

Browse files
authored
Merge pull request ROBOTIS-GIT#508 from ROBOTIS-GIT/ros2-devel
Ros2 devel
2 parents f212c28 + 9070018 commit 2446246

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

.github/workflows/ros-ci.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ name: ros2-ci
33
# Controls when the action will run. Triggers the workflow on push or pull request
44
on:
55
push:
6-
branches: [ ros2, ros2-devel ]
6+
branches: [ ros2, ros2-devel, foxy, galactic ]
77
pull_request:
8-
branches: [ ros2, ros2-devel ]
8+
branches: [ ros2, ros2-devel, foxy, galactic ]
99

1010
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
1111
jobs:
@@ -15,23 +15,23 @@ jobs:
1515
fail-fast: false
1616
matrix:
1717
ros_distribution:
18-
- dashing
18+
# - dashing
1919
- foxy
20-
# - galactic
20+
- galactic
2121
- rolling
2222
include:
2323
# Dashing Diademata (May 2019 - May 2021)
24-
- docker_image: ubuntu:bionic
25-
ros_distribution: dashing
26-
ros_version: 2
24+
# - docker_image: ubuntu:bionic
25+
# ros_distribution: dashing
26+
# ros_version: 2
2727
# Foxy Fitzroy (June 2020 - May 2023)
2828
- docker_image: ubuntu:focal
2929
ros_distribution: foxy
3030
ros_version: 2
3131
# Galactic Geochelone (May 2021)
32-
# - docker_image: ubuntu:focal
33-
# ros_distribution: galactic
34-
# ros_version: 2
32+
- docker_image: ubuntu:focal
33+
ros_distribution: galactic
34+
ros_version: 2
3535
# Rolling
3636
- docker_image: ubuntu:focal
3737
ros_distribution: rolling
@@ -46,7 +46,7 @@ jobs:
4646
with:
4747
path: ros_ws/src
4848
- name: Setup ROS environment
49-
uses: ros-tooling/setup-ros@0.1.2
49+
uses: ros-tooling/setup-ros@0.2.1
5050
with:
5151
required-ros-distributions: ${{ matrix.ros_distribution }}
5252
- name: Build and Test

dynamixel_sdk_custom_interfaces/package.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<url type="bugtracker">https://github.com/ROBOTIS-GIT/DynamixelSDK/issues</url>
1515
<buildtool_depend>ament_cmake</buildtool_depend>
1616
<buildtool_depend>rosidl_default_generators</buildtool_depend>
17+
<build_depend>builtin_interfaces</build_depend>
1718
<exec_depend>builtin_interfaces</exec_depend>
1819
<exec_depend>rosidl_default_runtime</exec_depend>
1920
<member_of_group>rosidl_interface_packages</member_of_group>

0 commit comments

Comments
 (0)