Merge pull request #24 from ROBOTIS-GIT/develop

prepare noetic release
ROBOTIS-GIT · Jun 22, 2021 · 55d771e · 55d771e
2 parents 132d3f5 + 10d3850
commit 55d771e
Show file tree

Hide file tree

Showing 7 changed files with 66 additions and 104 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: robotis_manipulator
+          target-ros1-distro: ${{ matrix.ros_distribution }}
+          vcs-repo-file-url: ""
diff --git a/.travis.yml b/.travis.yml
diff --git a/.vscode/settings.json b/.vscode/settings.json
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,11 @@
 Changelog for package robotis_manipulator
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.1.1 (2021-06-22)
+------------------
+* supports Noetic
+* Contributors: Will Son
+
 1.1.0 (2020-09-27)
 ------------------
 * supports Doxygen

diff --git a/CMakeLists.txt b/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(robotis_manipulator)
 
 add_compile_options(-std=c++11)

diff --git a/README.md b/README.md
@@ -1,9 +1,12 @@
 # Robotis Manipulator
 
-## ROS Packages for Robotis Manipulator
-|Version|Kinetic + Ubuntu Xenial|Melodic + Ubuntu Bionic|
-|:---:|:---:|:---:|
-|[![GitHub version](https://badge.fury.io/gh/ROBOTIS-GIT%2Frobotis_manipulator.svg)](https://badge.fury.io/gh/ROBOTIS-GIT%2Frobotis_manipulator)|[![Build Status](https://travis-ci.org/ROBOTIS-GIT/robotis_manipulator.svg?branch=kinetic-devel)](https://travis-ci.org/ROBOTIS-GIT/robotis_manipulator)|[![Build Status](https://travis-ci.org/ROBOTIS-GIT/robotis_manipulator.svg?branch=melodic-devel)](https://travis-ci.org/ROBOTIS-GIT/robotis_manipulator)|
+
+[![kinetic-devel Status](https://github.com/ROBOTIS-GIT/robotis_manipulator/workflows/kinetic-devel/badge.svg)](https://github.com/ROBOTIS-GIT/robotis_manipulator/tree/kinetic-devel)
+[![melodic-devel Status](https://github.com/ROBOTIS-GIT/robotis_manipulator/workflows/melodic-devel/badge.svg)](https://github.com/ROBOTIS-GIT/robotis_manipulator/tree/melodic-devel)
+[![noetic-devel Status](https://github.com/ROBOTIS-GIT/robotis_manipulator/workflows/noetic-devel/badge.svg)](https://github.com/ROBOTIS-GIT/robotis_manipulator/tree/noetic-devel)
+[![dashing-devel Status](https://github.com/ROBOTIS-GIT/robotis_manipulator/workflows/dashing-devel/badge.svg)](https://github.com/ROBOTIS-GIT/robotis_manipulator/tree/dashing-devel)
+[![foxy-devel Status](https://github.com/ROBOTIS-GIT/robotis_manipulator/workflows/foxy-devel/badge.svg)](https://github.com/ROBOTIS-GIT/robotis_manipulator/tree/foxy-devel)
+[![galactic-devel Status](https://github.com/ROBOTIS-GIT/robotis_manipulator/workflows/galactic-devel/badge.svg)](https://github.com/ROBOTIS-GIT/robotis_manipulator/tree/galactic-devel)
 
 ## ROBOTIS e-Manual for Robotis Manipulator
 - [ROBOTIS e-Manual for Robotis Manipulator and OpenManipulator](http://emanual.robotis.com/docs/en/platform/openmanipulator/)

diff --git a/package.xml b/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>robotis_manipulator</name>
-  <version>1.1.0</version>
+  <version>1.1.1</version>
   <description>
     This package contains the manipulation API and functions for controlling the manipulator.
   </description>
@@ -10,7 +10,6 @@
   <author email="thlim@robotis.com">Darby Lim</author>
   <author email="yhna@robotis.com">Yong-Ho Na</author>
   <author email="jhshim@robotis.com">Ryan Shim</author>
-  <maintainer email="hjkim@robotis.com">Hye-Jong KIM</maintainer>
   <maintainer email="willson@robotis.com">Will Son</maintainer>
   <url type="website">http://wiki.ros.org/robotis_manipulator</url>
   <url type="emanual">http://emanual.robotis.com/docs/en/platform/openmanipulator</url>