Skip to content

Commit 0beeb64

Browse files
ROBOTIS-WillROBOTIS-Will
authored
Merge pull request #15 from ROBOTIS-GIT/develop
prepare for noetic release
2 parents 57693f5 + 4428b15 commit 0beeb64

File tree

9 files changed

+74
-49
lines changed

9 files changed

+74
-49
lines changed

‎.github/workflows/ros-ci.yml

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
name: ros-ci
2+
3+
# Controls when the action will run. Triggers the workflow on push or pull request
4+
on:
5+
push:
6+
branches: [ master, develop, kinetic-devel, melodic-devel, noetic-devel ]
7+
pull_request:
8+
branches: [ master, develop, kinetic-devel, melodic-devel, noetic-devel ]
9+
10+
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
11+
jobs:
12+
ros-ci:
13+
runs-on: ubuntu-latest
14+
strategy:
15+
fail-fast: false
16+
matrix:
17+
ros_distribution:
18+
- kinetic
19+
- melodic
20+
- noetic
21+
include:
22+
# Kinetic Kame (May 2016 - May 2021)
23+
- docker_image: ubuntu:xenial
24+
ros_distribution: kinetic
25+
ros_version: 1
26+
# Melodic Morenia (May 2018 - May 2023)
27+
- docker_image: ubuntu:bionic
28+
ros_distribution: melodic
29+
ros_version: 1
30+
# Noetic Ninjemys (May 2020 - May 2025)
31+
- docker_image: ubuntu:focal
32+
ros_distribution: noetic
33+
ros_version: 1
34+
container:
35+
image: ${{ matrix.docker_image }}
36+
steps:
37+
- name: Setup directories
38+
run: mkdir -p ros_ws/src
39+
- name: checkout
40+
uses: actions/checkout@v2
41+
with:
42+
path: ros_ws/src
43+
- name: Setup ROS environment
44+
uses: ros-tooling/setup-ros@0.2.1
45+
with:
46+
required-ros-distributions: ${{ matrix.ros_distribution }}
47+
- name: Build and Test
48+
uses: ros-tooling/action-ros-ci@v0.2
49+
with:
50+
package-name: open_manipulator_simulations
51+
target-ros1-distro: ${{ matrix.ros_distribution }}
52+
vcs-repo-file-url: ""

‎.travis.yml

Lines changed: 0 additions & 37 deletions
This file was deleted.

‎README.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@
22
<img src="https://github.com/ROBOTIS-GIT/emanual/blob/master/assets/images/platform/openmanipulator_x/OpenManipulator.png">
33
<img src="https://github.com/ROBOTIS-GIT/emanual/blob/master/assets/images/platform/openmanipulator_x/OpenManipulator_Chain_Capture.png" width="500">
44

5-
## ROS Packages for OpenManipulator
6-
|Version|Kinetic + Ubuntu Xenial|Melodic + Ubuntu Bionic|
7-
|:---:|:---:|:---:|
8-
|[![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)|
5+
[![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)
6+
[![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)
7+
[![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)
8+
[![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)
9+
[![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)
10+
[![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)
911

1012
## ROBOTIS e-Manual for OpenManipulator
1113
- [ROBOTIS e-Manual for OpenManipulator](http://emanual.robotis.com/docs/en/platform/openmanipulator/)

‎open_manipulator_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 open_manipulator_gazebo
33
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44

5+
1.1.1 (2021-06-25)
6+
------------------
7+
* Noetic support
8+
* Contributors: Will Son
9+
510
1.1.0 (2019-02-08)
611
------------------
712
* added subscriber for gripper control `#3 <https://github.com/ROBOTIS-GIT/open_manipulator_simulations/issues/3>`_

‎open_manipulator_gazebo/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
################################################################################
22
# Set minimum required version of cmake, project name and compile options
33
################################################################################
4-
cmake_minimum_required(VERSION 2.8.3)
4+
cmake_minimum_required(VERSION 3.0.2)
55
project(open_manipulator_gazebo)
66

77
add_compile_options(-std=c++11)

‎open_manipulator_gazebo/package.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<package format="2">
33
<name>open_manipulator_gazebo</name>
4-
<version>1.1.0</version>
4+
<version>1.1.1</version>
55
<description>
66
Gazebo configurations package for OpenManipulator
77
</description>
@@ -10,8 +10,7 @@
1010
<author email="hjkim@robotis.com">Hye-Jong KIM</author>
1111
<author email="jhshim@robotis.com">Ryan Shim</author>
1212
<author email="yhna@robotis.com">Yong-Ho Na</author>
13-
<maintainer email="pyo@robotis.com">Pyo</maintainer>
14-
<maintainer email="hjkim@robotis.com">Hye-Jong KIM</maintainer>
13+
<maintainer email="willson@robotis.com">Will Son</maintainer>
1514
<url type="website">http://wiki.ros.org/open_manipulator_gazebo</url>
1615
<url type="emanual">http://emanual.robotis.com/docs/en/platform/openmanipulator</url>
1716
<url type="repository">https://github.com/ROBOTIS-GIT/open_manipulator_simulations</url>

‎open_manipulator_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 open_manipulator_simulations
33
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44

5+
1.1.1 (2021-06-25)
6+
------------------
7+
* Noetic support
8+
* Contributors: Will Son
9+
510
1.1.0 (2019-02-08)
611
------------------
712
* added subscriber for gripper control `#3 <https://github.com/ROBOTIS-GIT/open_manipulator_simulations/issues/3>`_

‎open_manipulator_simulations/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 2.8.3)
1+
cmake_minimum_required(VERSION 3.0.2)
22
project(open_manipulator_simulations)
33
find_package(catkin REQUIRED)
44
catkin_metapackage()

‎open_manipulator_simulations/package.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<package format="2">
33
<name>open_manipulator_simulations</name>
4-
<version>1.1.0</version>
4+
<version>1.1.1</version>
55
<description>
66
Simulation packages for OpenManipulator
77
</description>
@@ -10,8 +10,7 @@
1010
<author email="hjkim@robotis.com">Hye-Jong KIM</author>
1111
<author email="jhshim@robotis.com">Ryan Shim</author>
1212
<author email="yhna@robotis.com">Yong-Ho Na</author>
13-
<maintainer email="pyo@robotis.com">Pyo</maintainer>
14-
<maintainer email="hjkim@robotis.com">Hye-Jong KIM</maintainer>
13+
<maintainer email="willson@robotis.com">Will Son</maintainer>
1514
<url type="website">http://wiki.ros.org/open_manipulator_simulations</url>
1615
<url type="emanual">http://emanual.robotis.com/docs/en/platform/openmanipulator</url>
1716
<url type="repository">https://github.com/ROBOTIS-GIT/open_manipulator_simulations</url>

0 commit comments

Comments
 (0)