Merge pull request #15 from ROBOTIS-GIT/develop

prepare for noetic release
ROBOTIS-GIT · Jun 25, 2021 · 0beeb64 · 0beeb64
2 parents 57693f5 + 4428b15
commit 0beeb64
Show file tree

Hide file tree

Showing 9 changed files with 74 additions and 49 deletions.
diff --git a/.github/workflows/ros-ci.yml b/.github/workflows/ros-ci.yml
@@ -0,0 +1,52 @@
+name: ros-ci
+
+# Controls when the action will run. Triggers the workflow on push or pull request
+on:
+  push:
+    branches: [ master, develop, kinetic-devel, melodic-devel, noetic-devel ]
+  pull_request:
+    branches: [ master, develop, kinetic-devel, melodic-devel, noetic-devel ]
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  ros-ci:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ros_distribution:
+          - kinetic
+          - melodic
+          - noetic
+        include:
+            # Kinetic Kame (May 2016 - May 2021)
+          - docker_image: ubuntu:xenial
+            ros_distribution: kinetic
+            ros_version: 1
+            # Melodic Morenia (May 2018 - May 2023)
+          - docker_image: ubuntu:bionic
+            ros_distribution: melodic
+            ros_version: 1
+            # Noetic Ninjemys (May 2020 - May 2025)
+          - docker_image: ubuntu:focal
+            ros_distribution: noetic
+            ros_version: 1
+    container:
+      image: ${{ matrix.docker_image }}
+    steps:
+      - name: Setup directories
+        run: mkdir -p ros_ws/src
+      - name: checkout
+        uses: actions/checkout@v2
+        with:
+          path: ros_ws/src
+      - name: Setup ROS environment
+        uses: ros-tooling/setup-ros@0.2.1
+        with:
+          required-ros-distributions: ${{ matrix.ros_distribution }}
+      - name: Build and Test
+        uses: ros-tooling/action-ros-ci@v0.2
+        with:
+          package-name: open_manipulator_simulations
+          target-ros1-distro: ${{ matrix.ros_distribution }}
+          vcs-repo-file-url: ""
diff --git a/.travis.yml b/.travis.yml
diff --git a/README.md b/README.md
@@ -2,10 +2,12 @@
 <img src="https://github.com/ROBOTIS-GIT/emanual/blob/master/assets/images/platform/openmanipulator_x/OpenManipulator.png">
 <img src="https://github.com/ROBOTIS-GIT/emanual/blob/master/assets/images/platform/openmanipulator_x/OpenManipulator_Chain_Capture.png" width="500">
 
-## ROS Packages for OpenManipulator
-|Version|Kinetic + Ubuntu Xenial|Melodic + Ubuntu Bionic|
-|:---:|:---:|:---:|
-|[![GitHub version](https://badge.fury.io/gh/ROBOTIS-GIT%2Fopen_manipulator_simulations.svg)](https://badge.fury.io/gh/ROBOTIS-GIT%2Fopen_manipulator_simulations)|[![Build Status](https://travis-ci.org/ROBOTIS-GIT/open_manipulator_simulations.svg?branch=kinetic-devel)](https://travis-ci.org/ROBOTIS-GIT/open_manipulator_simulations)|[![Build Status](https://travis-ci.org/ROBOTIS-GIT/open_manipulator_simulations.svg?branch=melodic-devel)](https://travis-ci.org/ROBOTIS-GIT/open_manipulator_simulations)|
+[![kinetic-devel Status](https://github.com/ROBOTIS-GIT/open_manipulator_simulations/workflows/kinetic-devel/badge.svg)](https://github.com/ROBOTIS-GIT/open_manipulator_simulations/tree/kinetic-devel)
+[![melodic-devel Status](https://github.com/ROBOTIS-GIT/open_manipulator_simulations/workflows/melodic-devel/badge.svg)](https://github.com/ROBOTIS-GIT/open_manipulator_simulations/tree/melodic-devel)
+[![noetic-devel Status](https://github.com/ROBOTIS-GIT/open_manipulator_simulations/workflows/noetic-devel/badge.svg)](https://github.com/ROBOTIS-GIT/open_manipulator_simulations/tree/noetic-devel)
+[![dashing-devel Status](https://github.com/ROBOTIS-GIT/open_manipulator_simulations/workflows/dashing-devel/badge.svg)](https://github.com/ROBOTIS-GIT/open_manipulator_simulations/tree/dashing-devel)
+[![foxy-devel Status](https://github.com/ROBOTIS-GIT/open_manipulator_simulations/workflows/foxy-devel/badge.svg)](https://github.com/ROBOTIS-GIT/open_manipulator_simulations/tree/foxy-devel)
+[![galactic-devel Status](https://github.com/ROBOTIS-GIT/open_manipulator_simulations/workflows/galactic-devel/badge.svg)](https://github.com/ROBOTIS-GIT/open_manipulator_simulations/tree/galactic-devel)
 
 ## ROBOTIS e-Manual for OpenManipulator
 - [ROBOTIS e-Manual for OpenManipulator](http://emanual.robotis.com/docs/en/platform/openmanipulator/)

diff --git a/open_manipulator_gazebo/CHANGELOG.rst b/open_manipulator_gazebo/CHANGELOG.rst
@@ -2,6 +2,11 @@
 Changelog for package open_manipulator_gazebo
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.1.1 (2021-06-25)
+------------------
+* Noetic support
+* Contributors: Will Son
+
 1.1.0 (2019-02-08)
 ------------------
 * added subscriber for gripper control `#3 <https://github.com/ROBOTIS-GIT/open_manipulator_simulations/issues/3>`_

diff --git a/open_manipulator_gazebo/CMakeLists.txt b/open_manipulator_gazebo/CMakeLists.txt
@@ -1,7 +1,7 @@
 ################################################################################
 # Set minimum required version of cmake, project name and compile options
 ################################################################################
-cmake_minimum_required(VERSION 2.8.3)
+cmake_minimum_required(VERSION 3.0.2)
 project(open_manipulator_gazebo)
 
 add_compile_options(-std=c++11)

diff --git a/open_manipulator_gazebo/package.xml b/open_manipulator_gazebo/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>open_manipulator_gazebo</name>
-  <version>1.1.0</version>
+  <version>1.1.1</version>
   <description>
     Gazebo configurations package for OpenManipulator
   </description>
@@ -10,8 +10,7 @@
   <author email="hjkim@robotis.com">Hye-Jong KIM</author>
   <author email="jhshim@robotis.com">Ryan Shim</author>
   <author email="yhna@robotis.com">Yong-Ho Na</author>
-  <maintainer email="pyo@robotis.com">Pyo</maintainer>
-  <maintainer email="hjkim@robotis.com">Hye-Jong KIM</maintainer>
+  <maintainer email="willson@robotis.com">Will Son</maintainer>
   <url type="website">http://wiki.ros.org/open_manipulator_gazebo</url>
   <url type="emanual">http://emanual.robotis.com/docs/en/platform/openmanipulator</url>
   <url type="repository">https://github.com/ROBOTIS-GIT/open_manipulator_simulations</url>

diff --git a/open_manipulator_simulations/CHANGELOG.rst b/open_manipulator_simulations/CHANGELOG.rst
@@ -2,6 +2,11 @@
 Changelog for package open_manipulator_simulations
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.1.1 (2021-06-25)
+------------------
+* Noetic support
+* Contributors: Will Son
+
 1.1.0 (2019-02-08)
 ------------------
 * added subscriber for gripper control `#3 <https://github.com/ROBOTIS-GIT/open_manipulator_simulations/issues/3>`_

diff --git a/open_manipulator_simulations/CMakeLists.txt b/open_manipulator_simulations/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.3)
+cmake_minimum_required(VERSION 3.0.2)
 project(open_manipulator_simulations)
 find_package(catkin REQUIRED)
 catkin_metapackage()
diff --git a/open_manipulator_simulations/package.xml b/open_manipulator_simulations/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>open_manipulator_simulations</name>
-  <version>1.1.0</version>
+  <version>1.1.1</version>
   <description>
     Simulation packages for OpenManipulator
   </description>
@@ -10,8 +10,7 @@
   <author email="hjkim@robotis.com">Hye-Jong KIM</author>
   <author email="jhshim@robotis.com">Ryan Shim</author>
   <author email="yhna@robotis.com">Yong-Ho Na</author>
-  <maintainer email="pyo@robotis.com">Pyo</maintainer>
-  <maintainer email="hjkim@robotis.com">Hye-Jong KIM</maintainer>
+  <maintainer email="willson@robotis.com">Will Son</maintainer>
   <url type="website">http://wiki.ros.org/open_manipulator_simulations</url>
   <url type="emanual">http://emanual.robotis.com/docs/en/platform/openmanipulator</url>
   <url type="repository">https://github.com/ROBOTIS-GIT/open_manipulator_simulations</url>