Skip to content

Commit e6d033b

Browse files
ROBOTIS-WillROBOTIS-Will
committed
Merge branch 'ros2-devel' into ros2
2 parents 101704f + fcf21a0 commit e6d033b

File tree

9 files changed

+30
-33
lines changed

9 files changed

+30
-33
lines changed

‎.github/workflows/lint.yml‎

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,30 +6,12 @@ name: Lint
66
# events but only for the master branch
77
on:
88
push:
9-
branches: [ ros2, ros2-devel, foxy-devel, galactic-devel ]
9+
branches: [ ros2, ros2-devel, galactic-devel ]
1010
pull_request:
11-
branches: [ ros2, ros2-devel, foxy-devel, galactic-devel ]
11+
branches: [ ros2, ros2-devel, galactic-devel ]
1212

1313
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
1414
jobs:
15-
ament_lint_foxy:
16-
runs-on: ubuntu-20.04
17-
strategy:
18-
fail-fast: false
19-
matrix:
20-
linter: [copyright, cppcheck, cpplint, flake8, pep257, xmllint]
21-
distribution: [foxy]
22-
steps:
23-
- uses: actions/checkout@v1
24-
- uses: ros-tooling/setup-ros@0.2.1
25-
- uses: ros-tooling/action-ros-lint@v0.1
26-
with:
27-
distribution: ${{ matrix.distribution }}
28-
linter: ${{ matrix.linter }}
29-
package-name:
30-
turtlebot3_simulations
31-
turtlebot3_fake_node
32-
turtlebot3_gazebo
3315

3416
ament_lint_galactic:
3517
runs-on: ubuntu-20.04

‎.github/workflows/ros-ci.yml‎

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

1010
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
1111
jobs:
@@ -17,7 +17,7 @@ jobs:
1717
ros_distribution:
1818
# - dashing
1919
# - foxy
20-
# - galactic
20+
- galactic
2121
- rolling
2222
include:
2323
# Dashing Diademata (May 2019 - May 2021)
@@ -29,9 +29,9 @@ jobs:
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

‎turtlebot3_fake_node/CHANGELOG.rst‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
Changelog for package turtlebot3_fake
33
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44

5+
2.2.5 (2021-08-25)
6+
------------------
7+
* Release for ROS2 Rolling
8+
* Contributors: Will Son
9+
510
2.2.4 (2021-06-14)
611
------------------
712
* Release for ROS2 Galactic

‎turtlebot3_fake_node/package.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
33
<package format="3">
44
<name>turtlebot3_fake_node</name>
5-
<version>2.2.4</version>
5+
<version>2.2.5</version>
66
<description>
77
Package for TurtleBot3 fake node. With this package, simple tests can be done without a robot.
88
You can do simple tests using this package on rviz without real robots.

‎turtlebot3_gazebo/CHANGELOG.rst‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
Changelog for package turtlebot3_gazebo
33
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44

5+
2.2.5 (2021-08-25)
6+
------------------
7+
* Release for ROS2 Rolling
8+
* Contributors: Will Son
9+
510
2.2.4 (2021-06-14)
611
------------------
712
* Release for ROS2 Galactic

‎turtlebot3_gazebo/package.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
33
<package format="3">
44
<name>turtlebot3_gazebo</name>
5-
<version>2.2.4</version>
5+
<version>2.2.5</version>
66
<description>
77
Gazebo simulation package for the TurtleBot3
88
</description>

‎turtlebot3_simulations/CHANGELOG.rst‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
Changelog for package turtlebot3_simulations
33
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44

5+
2.2.5 (2021-08-25)
6+
------------------
7+
* Release for ROS2 Rolling
8+
* Contributors: Will Son
9+
510
2.2.4 (2021-06-14)
611
------------------
712
* Release for ROS2 Galactic

‎turtlebot3_simulations/package.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
33
<package format="3">
44
<name>turtlebot3_simulations</name>
5-
<version>2.2.4</version>
5+
<version>2.2.5</version>
66
<description>
77
ROS 2 packages for TurtleBot3 simulations
88
</description>

‎turtlebot3_simulations_ci.repos‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@ repositories:
22
turtlebot3/turtlebot3:
33
type: git
44
url: https://github.com/ROBOTIS-GIT/turtlebot3.git
5-
version: galactic-devel
5+
version: ros2
66
turtlebot3/turtlebot3_msgs:
77
type: git
88
url: https://github.com/ROBOTIS-GIT/turtlebot3_msgs.git
9-
version: galactic-devel
9+
version: ros2
1010
utils/DynamixelSDK:
1111
type: git
1212
url: https://github.com/ROBOTIS-GIT/DynamixelSDK.git
13-
version: galactic-devel
13+
version: ros2
1414
utils/hls_lfcd_lds_driver:
1515
type: git
1616
url: https://github.com/ROBOTIS-GIT/hls_lfcd_lds_driver.git
17-
version: galactic-devel
17+
version: ros2

0 commit comments

Comments
 (0)