Merge branch 'ros2-devel' into ros2

ROBOTIS-GIT · Aug 25, 2021 · e6d033b · e6d033b
2 parents 101704f + fcf21a0
commit e6d033b
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 33 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -6,30 +6,12 @@ name: Lint
 # events but only for the master branch
 on:
   push:
-    branches: [ ros2, ros2-devel, foxy-devel, galactic-devel ]
+    branches: [ ros2, ros2-devel, galactic-devel ]
   pull_request:
-    branches: [ ros2, ros2-devel, foxy-devel, galactic-devel ]
+    branches: [ ros2, ros2-devel, galactic-devel ]
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
-  ament_lint_foxy:
-    runs-on: ubuntu-20.04
-    strategy:
-      fail-fast: false
-      matrix:
-        linter: [copyright, cppcheck, cpplint, flake8, pep257, xmllint]
-        distribution: [foxy]
-    steps:
-      - uses: actions/checkout@v1
-      - uses: ros-tooling/setup-ros@0.2.1
-      - uses: ros-tooling/action-ros-lint@v0.1
-        with:
-          distribution: ${{ matrix.distribution }}
-          linter: ${{ matrix.linter }}
-          package-name: 
-            turtlebot3_simulations
-            turtlebot3_fake_node
-            turtlebot3_gazebo
 
   ament_lint_galactic:
     runs-on: ubuntu-20.04

diff --git a/.github/workflows/ros-ci.yml b/.github/workflows/ros-ci.yml
@@ -3,9 +3,9 @@ name: ros2-devel
 # Controls when the action will run. Triggers the workflow on push or pull request
 on:
   push:
-    branches: [ ros2, ros2-devel, foxy-devel, galactic-devel ]
+    branches: [ ros2, ros2-devel, galactic-devel ]
   pull_request:
-    branches: [ ros2, ros2-devel, foxy-devel, galactic-devel ]
+    branches: [ ros2, ros2-devel, galactic-devel ]
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
@@ -17,7 +17,7 @@ jobs:
         ros_distribution:
           # - dashing
           # - foxy
-          # - galactic
+          - galactic
           - rolling
         include:
             # Dashing Diademata (May 2019 - May 2021)
@@ -29,9 +29,9 @@ jobs:
           #   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

diff --git a/turtlebot3_fake_node/CHANGELOG.rst b/turtlebot3_fake_node/CHANGELOG.rst
@@ -2,6 +2,11 @@
 Changelog for package turtlebot3_fake
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.2.5 (2021-08-25)
+------------------
+* Release for ROS2 Rolling
+* Contributors: Will Son
+
 2.2.4 (2021-06-14)
 ------------------
 * Release for ROS2 Galactic

diff --git a/turtlebot3_fake_node/package.xml b/turtlebot3_fake_node/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>turtlebot3_fake_node</name>
-  <version>2.2.4</version>
+  <version>2.2.5</version>
   <description>
     Package for TurtleBot3 fake node. With this package, simple tests can be done without a robot.
     You can do simple tests using this package on rviz without real robots.

diff --git a/turtlebot3_gazebo/CHANGELOG.rst b/turtlebot3_gazebo/CHANGELOG.rst
@@ -2,6 +2,11 @@
 Changelog for package turtlebot3_gazebo
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.2.5 (2021-08-25)
+------------------
+* Release for ROS2 Rolling
+* Contributors: Will Son
+
 2.2.4 (2021-06-14)
 ------------------
 * Release for ROS2 Galactic

diff --git a/turtlebot3_gazebo/package.xml b/turtlebot3_gazebo/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>turtlebot3_gazebo</name>
-  <version>2.2.4</version>
+  <version>2.2.5</version>
   <description>
     Gazebo simulation package for the TurtleBot3
   </description>

diff --git a/turtlebot3_simulations/CHANGELOG.rst b/turtlebot3_simulations/CHANGELOG.rst
@@ -2,6 +2,11 @@
 Changelog for package turtlebot3_simulations
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.2.5 (2021-08-25)
+------------------
+* Release for ROS2 Rolling
+* Contributors: Will Son
+
 2.2.4 (2021-06-14)
 ------------------
 * Release for ROS2 Galactic

diff --git a/turtlebot3_simulations/package.xml b/turtlebot3_simulations/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>turtlebot3_simulations</name>
-  <version>2.2.4</version>
+  <version>2.2.5</version>
   <description>
     ROS 2 packages for TurtleBot3 simulations
   </description>

diff --git a/turtlebot3_simulations_ci.repos b/turtlebot3_simulations_ci.repos
@@ -2,16 +2,16 @@ repositories:
   turtlebot3/turtlebot3:
     type: git
     url: https://github.com/ROBOTIS-GIT/turtlebot3.git
-    version: galactic-devel
+    version: ros2
   turtlebot3/turtlebot3_msgs:
     type: git
     url: https://github.com/ROBOTIS-GIT/turtlebot3_msgs.git
-    version: galactic-devel
+    version: ros2
   utils/DynamixelSDK:
     type: git
     url: https://github.com/ROBOTIS-GIT/DynamixelSDK.git
-    version: galactic-devel
+    version: ros2
   utils/hls_lfcd_lds_driver:
     type: git
     url: https://github.com/ROBOTIS-GIT/hls_lfcd_lds_driver.git
-    version: galactic-devel
+    version: ros2