From 10d3850318ab33c458f514cf6eed10b69aac955d Mon Sep 17 00:00:00 2001 From: Will Son Date: Tue, 22 Jun 2021 16:18:19 +0900 Subject: [PATCH] prepare noetic release --- .github/workflows/ros-ci.yml | 52 +++++++++++++++++++++++++++++++ .travis.yml | 37 ---------------------- .vscode/settings.json | 60 ------------------------------------ CHANGELOG.rst | 5 +++ CMakeLists.txt | 2 +- README.md | 11 ++++--- package.xml | 3 +- 7 files changed, 66 insertions(+), 104 deletions(-) create mode 100644 .github/workflows/ros-ci.yml delete mode 100644 .travis.yml delete mode 100644 .vscode/settings.json diff --git a/.github/workflows/ros-ci.yml b/.github/workflows/ros-ci.yml new file mode 100644 index 0000000..f2aead7 --- /dev/null +++ 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: "" \ No newline at end of file diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index bfbcb9b..0000000 --- a/.travis.yml +++ /dev/null @@ -1,37 +0,0 @@ -# This config file for Travis CI utilizes ros-industrial/industrial_ci package. -# For more info for the package, see https://github.com/ros-industrial/industrial_ci/blob/master/README.rst - -sudo: required -dist: trusty -services: - - docker -language: generic -python: - - "2.7" -compiler: - - gcc -notifications: - email: - on_success: change - on_failure: always - recipients: - - willson@robotis.com -env: - matrix: - - ROS_DISTRO=kinetic ROS_REPO=ros-shadow-fixed UPSTREAM_WORKSPACE=debian OS_NAME=ubuntu OS_CODE_NAME=xenial - - ROS_DISTRO=melodic ROS_REPO=ros-shadow-fixed UPSTREAM_WORKSPACE=debian OS_NAME=ubuntu OS_CODE_NAME=bionic - - ROS_DISTRO=melodic ROS_REPO=ros-shadow-fixed UPSTREAM_WORKSPACE=debian OS_NAME=debian OS_CODE_NAME=stretch -matrix: - allow_failures: - - env: ROS_DISTRO=melodic ROS_REPO=ros-shadow-fixed UPSTREAM_WORKSPACE=debian OS_NAME=debian OS_CODE_NAME=stretch -branches: - only: - - master - - develop - - kinetic-devel - - melodic-devel -install: - - git clone https://github.com/ros-industrial/industrial_ci.git .ci_config -script: - - source .ci_config/travis.sh - \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 3528db9..0000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,60 +0,0 @@ -{ - "files.associations": { - "cctype": "cpp", - "clocale": "cpp", - "cmath": "cpp", - "cstdarg": "cpp", - "cstddef": "cpp", - "cstdio": "cpp", - "cstdlib": "cpp", - "cstring": "cpp", - "ctime": "cpp", - "cwchar": "cpp", - "cwctype": "cpp", - "array": "cpp", - "atomic": "cpp", - "strstream": "cpp", - "*.tcc": "cpp", - "bitset": "cpp", - "chrono": "cpp", - "complex": "cpp", - "cstdint": "cpp", - "deque": "cpp", - "list": "cpp", - "unordered_map": "cpp", - "vector": "cpp", - "exception": "cpp", - "algorithm": "cpp", - "functional": "cpp", - "iterator": "cpp", - "map": "cpp", - "memory": "cpp", - "memory_resource": "cpp", - "optional": "cpp", - "ratio": "cpp", - "set": "cpp", - "string": "cpp", - "string_view": "cpp", - "system_error": "cpp", - "tuple": "cpp", - "type_traits": "cpp", - "utility": "cpp", - "fstream": "cpp", - "initializer_list": "cpp", - "iomanip": "cpp", - "iosfwd": "cpp", - "iostream": "cpp", - "istream": "cpp", - "limits": "cpp", - "new": "cpp", - "ostream": "cpp", - "sstream": "cpp", - "stdexcept": "cpp", - "streambuf": "cpp", - "thread": "cpp", - "cfenv": "cpp", - "cinttypes": "cpp", - "typeinfo": "cpp" - }, - "C_Cpp.errorSquiggles": "Disabled" -} \ No newline at end of file diff --git a/CHANGELOG.rst b/CHANGELOG.rst index e53a55e..83bc679 100644 --- 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 index aeb2e1f..423daee 100644 --- 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 index 704d6b9..a994301 100644 --- 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 index 34974d5..933ecb3 100644 --- a/package.xml +++ b/package.xml @@ -1,7 +1,7 @@  robotis_manipulator - 1.1.0 + 1.1.1 This package contains the manipulation API and functions for controlling the manipulator. @@ -10,7 +10,6 @@ Darby Lim Yong-Ho Na Ryan Shim - Hye-Jong KIM Will Son http://wiki.ros.org/robotis_manipulator http://emanual.robotis.com/docs/en/platform/openmanipulator