Skip to content
Snippets Groups Projects
Commit c9fea19e authored by Sebastian Jahr's avatar Sebastian Jahr
Browse files

add support for ROS Melodic Morenia

parent f7f00b6d
No related branches found
No related tags found
No related merge requests found
FROM osrf/ros:melodic-desktop-bionic
RUN apt-get update && apt-get install -y \
clang-6.0 \
clang-format-6.0 \
clang-tidy-6.0 \
ros-melodic-ros-control \
&& rm -rf /var/lib/apt/lists/*
FROM osrf/ros:kinetic-desktop-xenial
FROM osrf/ros:melodic-desktop-kinetic
RUN apt-get update && apt-get install -y \
clang-5.0 \
clang-format-5.0 \
clang-tidy-5.0 \
clang-6.0 \
clang-format-6.0 \
clang-tidy-6.0 \
ros-kinetic-ros-control \
&& rm -rf /var/lib/apt/lists/*
......@@ -3,8 +3,6 @@
set -e
set -x
. /opt/ros/kinetic/setup.sh
rm -f src/CMakeLists.txt
catkin_init_workspace src
......
......@@ -6,7 +6,7 @@ Requires `libfranka` >= 0.5.0
* Moved `panda_moveit_config` to [`ros-planning`](https://github.com/ros-planning/panda_moveit_config)
* Publish `robot_mode` in `franka_state_controller`
* Added support for ROS Melodic Morenia.
## 0.6.0 - 2018-08-08
Requires `libfranka` >= 0.5.0
......
#!groovy
def get_stages(ubuntu_version, ros_distribution){
node('docker') {
step([$class: 'StashNotifier'])
......@@ -30,10 +31,11 @@ node('docker') {
'''
}
docker.build('franka_ros-ci-worker', 'src/franka_ros/.ci').inside {
docker.build("franka_ros-ci-worker:${ubuntu_version}", "-f src/franka_ros/.ci/Dockerfile.${ubuntu_version} .ci").inside {
withEnv(["CMAKE_PREFIX_PATH+=${env.WORKSPACE}/dist/libfranka/lib/cmake/Franka",
"ROS_HOME=${env.WORKSPACE}/ros-home"]) {
stage('Build & Lint (Debug)') {
sh ". /opt/ros/${ros_distribution}/setup.sh"
sh 'src/franka_ros/.ci/debug.sh'
junit 'build-debug/test_results/**/*.xml'
}
......@@ -48,3 +50,11 @@ node('docker') {
step([$class: 'StashNotifier'])
}
}
}
parallel(
'xenial': get_stages('xenial, kinetic'),
'bionic': get_stages('bionic, melodic'),
)
include(CMakeParseArguments)
find_program(CLANG_FORMAT_PROG clang-format-5.0 DOC "'clang-format' executable")
find_program(CLANG_FORMAT_PROG clang-format-6.0 DOC "'clang-format' executable")
if(CLANG_FORMAT_PROG AND NOT TARGET format)
add_custom_target(format)
add_custom_target(check-format)
endif()
find_program(CLANG_TIDY_PROG clang-tidy-5.0 DOC "'clang-tidy' executable")
find_program(CLANG_TIDY_PROG clang-tidy-6.0 DOC "'clang-tidy' executable")
if(CLANG_TIDY_PROG AND NOT TARGET tidy)
if(NOT CMAKE_EXPORT_COMPILE_COMMANDS)
message(WARNING "Invoke Catkin/CMake with '-DCMAKE_EXPORT_COMPILE_COMMANDS=ON'
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment